cards 2.4.124

fixes in mybld
mybld -p new option

cards install a set of package even a package and a set has the same name
cards remove a set of package

runtime_dependencies_utils.cxx
   small mistake, missing a return

Makefile.inc

@@ -45,7 +45,7 @@ INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_DIR  = $(INSTALL) -d
 
 
-VERSION = 2.4.123
+VERSION = 2.4.124
 
 NAME = cards-$(VERSION)
 

scripts/mybld.in

@@ -220,6 +220,10 @@ case $1 in
 		shift
 		PARAM+=($1);;
 
+	-p|--pause)
+		PAUSE=" && export PATH=/root/$VERSION/scripts:$PATH && printf \"You are now in the chroot.\n\
+Type exit when finish.\n\n Good Luck !!!\n\n\" && bash";;
+
 	-I|--init)
 		INIT="yes";;
 
@@ -456,9 +460,11 @@ if [ ! -d .git ]; then
 "
 	exit 1
 fi
-parse_arguments "$@"
 
 [ -z "$VERSION" ] && VERSION="$(git branch --show-current)"
+
+parse_arguments "$@"
+
 [ -z "$COLLECTION" ] && find_collection
 
 if [ "$INIT" == "yes" ]; then
@@ -552,6 +558,12 @@ GIT=$(basename $GIT_PROJ)
 mkdir -p "$ROOT/${VERSION}/${COLLECTION}/etc" || exit 1
 
 setup_cards_conf
+
+DEVEL="cards.devel \
+&& cd /root/$GIT \
+$PAUSE \
+&& bash scripts/$COLLECTION"
+
 echo "$CARDS_CONF" > $ROOT/$VERSION/$COLLECTION/etc/cards.conf
 [ -z "${PARAM[0]}" ] && CHROOT="ncurses readline bash"
 if [ "$COLLECTION" == "base" ] \
@@ -561,18 +573,13 @@ if [ "$COLLECTION" == "base" ] \
 || [ "$COLLECTION" == "gui-extra" ] \
 || [ "$COLLECTION" == "desktops" ] \
 || [ "$COLLECTION" == "nos" ]; then
-	DEVEL="cards.devel \
-&& cd /root/$GIT \
-&& bash scripts/$COLLECTION"
 	if ! [ -z "${PARAM[0]}" ]; then
 		DEVEL="$DEVEL ${PARAM[0]}"
 	else
 		DEVEL="$DEVEL -a"
 	fi
 else
-	DEVEL="cards.devel \
-&& cd /root/$GIT \
-&& bash scripts/$COLLECTION -a \
+	DEVEL="$DEVEL -a \
 && bash scripts/$COLLECTION-extra -a"
 	EXTRA="yes"
 fi

scripts/pkgmk.in

@@ -327,7 +327,7 @@ unpack_source() {
 	for FILE in ${source[@]}; do
 		LOCAL_FILENAME="$(get_filename $FILE)"
 		case $LOCAL_FILENAME in
-			*.tar|*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tar.xz|*.txz|*.tar.lzma|*.zip|*.rpm|*.tar.lz|*.7z|*.deb)
+			*.tar|*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tar.xz|*.txz|*.tar.lzma|*.zip|*.tar.zst|*.rpm|*.tar.lz|*.7z|*.deb)
 				if [ "$PKGMK_IGNORE_UNPACK" != "yes" ];then
 					COMMAND="bsdtar -p -o -C $SRC -xf $LOCAL_FILENAME"
 				else

src/cards_install.cxx

@@ -46,7 +46,7 @@ Cards_install::Cards_install(const CardsArgumentParser& argParser,
 		std::set<std::string> ListOfPackage = getListOfPackagesFromSet(i);
 		if (ListOfPackage.empty() )
 			ListOfPackage = getListOfPackagesFromCollection(i);
-		if ( (!ListOfPackage.empty()) && (!checkBinaryExist(i)) ) {
+		if ( !ListOfPackage.empty() )  {
 			/*
 			* It's a collection or a set
 			*/

src/runtime_dependencies_utils.cxx

@@ -67,17 +67,8 @@ int get_64bit_elf_header_part(FILE *file)
 }
 int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fileName)
 {
-
 #ifndef NDEBUG
-	printf("sizeof unsigned char: %d\n",sizeof(unsigned char));
-	printf("sizeof unsigned short int: %d\n",sizeof(unsigned short int));
-	printf("sizeof short int: %d\n",sizeof(short int));
-	printf("sizeof int: %d\n",sizeof(int));
-	printf("sizeof unsigned int: %d\n",sizeof(unsigned int));
-	printf("sizeof int long: %d\n",sizeof(int long));
-	printf("sizeof double: %d\n",sizeof(double));
-	printf("sizeof unsigned long long: %u\n",sizeof( unsigned long long)); 
-	printf("sizeof unsigned long : %u\n",sizeof( unsigned long));
+	printf("\n==>File open: %s\n",fileName.c_str());
 #endif
 	unsigned long dynamic_addr = 0;
 	unsigned long dynamic_size_32bits = 0;
@@ -95,10 +86,6 @@ int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fil
 	file = fopen (file_name, "rb" );
 	if (file == NULL)
 		return error("Cannot open the file");
-#ifndef NDEBUG
- printf("File open: %s\n",file_name);
-#endif
-
 
 	/* Magic number */
 	buffer = (Elf_Ehdr_Begin *)malloc( sizeof(elf_header_begin));
@@ -141,6 +128,7 @@ int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fil
 
 	if (elf_header_end.e_shnum == 0)
 		return error ("There are no Sections in this file");
+
 #ifndef NDEBUG
   printf("\nNumber of Section header: %d 0x%x\n",
 	elf_header_end.e_shnum,elf_header_end.e_shnum);
@@ -151,6 +139,7 @@ int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fil
 	printf("Size of Program header entity: %d 0x%x\n\n",
 	elf_header_end.e_phentsize,elf_header_end.e_phentsize);
 #endif
+
 /* Main check if it's a 32 bits or 64 bits elf files */
 	if ( elf_header_begin.e_ident[EI_CLASS] == ELFCLASS32 )
 	{
@@ -165,7 +154,7 @@ int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fil
 				elf_header_end.e_shnum);
 
 		if (!section_headers_32bits)
-		  return error ("There are no Sections in this file\n");
+		  return error ("There are no 32bits Sections in this file\n");
 
 		for (int i = 0;i < elf_header_end.e_shnum;i++)
 		{
@@ -222,7 +211,7 @@ int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fil
 			1,dynamic_size_32bits);
 
 		if (!dynamics_section_32bits)
-			error("Out of mem");
+			return error("Out of mem");
 
 		if (fseek (file, 0, SEEK_END))
 			return error ("Error to seek to end of the file");
@@ -304,7 +293,7 @@ int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fil
 					dependencies_utils_end();
 #ifndef NDEBUG
 	printf("No dynamics found\n");
-		printf("offset : %u 0x%x\n",
+	printf("offset : %u 0x%x\n",
 	offset,offset);
 #endif
 					return 0;
@@ -316,9 +305,9 @@ int getRuntimeLibrariesList(set<string>& runtimeLibrariesList, const string& fil
     {
       dependencies_utils_end();
 #ifndef NDEBUG
-  printf("No dynamics found\n");
-    printf("offset : %u 0x%x\n",
-  offset,offset);
+	printf("No dynamics found\n");
+	printf("offset : %u 0x%x\n",
+	offset,offset);
 #endif
       return 0;
     }