Necessary updates for 3.3.3 release

Should cover everything worth mentioning in NEWS, plus the version number
bumps as usual.

Signed-off-by: Dan McGee <dan@archlinux.org>

NEWS

@@ -1,5 +1,14 @@
 VERSION         DESCRIPTION
 -----------------------------------------------------------------------------
+3.3.3         - correctly check the return code from opendir()
+              - fix possible infinite loop in alpm_list_remove()
+              - makepkg:
+                - quote arrays to preserve spaces in arrays (FS#16871)
+                - allow passing arguments with spaces
+                - adjust preselected option for clearing cache
+              - translations:
+                - zh_CN: fix positional parameter usage in makepkg (FS#16983)
+                - el: fix Y/N response translation (FS#16568)
 3.3.2         - fix infinite filesize download issue (FS#16359)
               - fix bogus download size on TotalDownload
               - documentation updates

configure.ac

@@ -42,12 +42,12 @@ AC_PREREQ(2.60)
 #     pacman_version_micro += 1
 
 m4_define([lib_current], [4])
-m4_define([lib_revision], [2])
+m4_define([lib_revision], [3])
 m4_define([lib_age], [0])
 
 m4_define([pacman_version_major], [3])
 m4_define([pacman_version_minor], [3])
-m4_define([pacman_version_micro], [2])
+m4_define([pacman_version_micro], [3])
 m4_define([pacman_version],
           [pacman_version_major.pacman_version_minor.pacman_version_micro])
 

doc/index.txt

@@ -62,6 +62,7 @@ Releases
 `------------`-------
 Date         Version
 ---------------------
+2009-11-10   v3.3.3
 2009-10-05   v3.3.2
 2009-09-22   v3.3.1
 2009-08-02   v3.3.0

lib/libalpm/alpm_list.c

@@ -309,6 +309,7 @@ alpm_list_t SYMEXPORT *alpm_list_remove(alpm_list_t *haystack, const void *needl
 
 	while(i) {
 		if(i->data == NULL) {
+			i = i->next;
 			continue;
 		}
 		tmp = i->next;

lib/libalpm/po/zh_CN.po

@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-06 19:12+0200\n"
+"PO-Revision-Date: 2009-10-08 20:48+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -213,9 +213,9 @@ msgstr "无法写入文件 '%s'\n"
 msgid "error writing to file '%s': %s\n"
 msgstr "写入文件 '%1$s' 时出错: %2$s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "failed retrieving file '%s' from %s\n"
-msgstr "无法从 %2$s : %3$s 获取文件 '%1$s'\n"
+msgstr "无法从 %2$s 获取文件 '%1$s'\n"
 
 #, c-format
 msgid "%s appears to be truncated: %jd/%jd bytes\n"

lib/libalpm/util.c

@@ -404,7 +404,8 @@ int _alpm_rmrf(const char *path)
 				}
 			}
 		} else {
-			if((dirp = opendir(path)) == (DIR *)-1) {
+			dirp = opendir(path);
+			if(!dirp) {
 				return(1);
 			}
 			for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {

po/el.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-06 19:21+0200\n"
+"PO-Revision-Date: 2009-10-08 19:48+0200\n"
 "Last-Translator: Christos Nouskas <nous@archlinux.us>\n"
 "Language-Team: greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgstr "αναβάθμιση %s...\n"
 
 #, c-format
 msgid "checking package integrity...\n"
-msgstr "έλεγχος ακεραιότητας πακέτου...\n"
+msgstr "έλεγχος ακεραιότητας πακέτων...\n"
 
 #, c-format
 msgid "checking delta integrity...\n"
@@ -965,15 +965,15 @@ msgstr "Προαιρετικές εξαρτήσεις για το  %s\n"
 
 #, c-format
 msgid "[Y/n]"
-msgstr "[Y-ΝΑΙ/n-όχι]"
+msgstr "[Y/n]"
 
 #, c-format
 msgid "[y/N]"
-msgstr "[y-ναι/N-ΟΧΙ]"
+msgstr "[y/N]"
 
 #, c-format
 msgid "Y"
-msgstr "Y-ΝΑΙ"
+msgstr "Y"
 
 #, c-format
 msgid "YES"
@@ -981,7 +981,7 @@ msgstr "ΝΑΙ"
 
 #, c-format
 msgid "N"
-msgstr "N-ΟΧΙ"
+msgstr "N"
 
 #, c-format
 msgid "NO"

po/zh_CN.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Pacman package manager 3.3.1\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
 "POT-Creation-Date: 2009-10-04 16:48+0200\n"
-"PO-Revision-Date: 2009-10-06 19:12+0200\n"
+"PO-Revision-Date: 2009-10-18 23:53+0700\n"
 "Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: Chinese Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -1075,7 +1075,7 @@ msgid "Unable to find source file %s for extraction."
 msgstr "无法找到源代码文件 %s 进行解压缩。"
 
 msgid "Extracting %s with %s"
-msgstr "正在使用 %2$s 解压缩 %1$s"
+msgstr "正在解压缩 %s，使用 %s"
 
 msgid "Failed to extract %s"
 msgstr "无法解压缩 %s"
@@ -1659,9 +1659,8 @@ msgstr "正在生成更新的数据库文件 '%s'"
 msgid "'%s' does not have a valid archive extension."
 msgstr "'%s' 未包含有效的压缩包扩展名。"
 
-#, fuzzy
 msgid "No packages remain, creating empty database."
-msgstr "没有软件包被修改，无事可做。"
+msgstr "没有包含软件包，正在创建空数据库。"
 
 msgid "No packages modified, nothing to do."
 msgstr "没有软件包被修改，无事可做。"

scripts/makepkg.sh.in

@@ -1298,7 +1298,7 @@ devel_update() {
 backup_package_variables() {
 	for var in ${splitpkg_overrides[@]}; do
 		indirect="${var}_backup"
-		eval "${indirect}=(\${$var[@]})"
+		eval "${indirect}=(\"\${$var[@]}\")"
 	done
 }
 
@@ -1306,16 +1306,11 @@ restore_package_variables() {
 	for var in ${splitpkg_overrides[@]}; do
 		indirect="${var}_backup"
 		if [ -n "${!indirect}" ]; then
-			eval "${var}=(\${$indirect[@]})"
+			eval "${var}=(\"\${$indirect[@]}\")"
 		else
 			unset ${var}
 		fi
 	done
-
-	# pkgdesc gets restored as an array - convert back to a string
-	local pkgdesc_backup="${pkgdesc[@]}"
-	unset pkgdesc
-	pkgdesc=${pkgdesc_backup}
 }
 
 # getopt like parser
@@ -1462,7 +1457,7 @@ if [ ! $(type -t gettext) ]; then
 	}
 fi
 
-ARGLIST=$@
+ARGLIST=("$@")
 
 # Parse Command Line Options.
 OPT_SHORT="AcCdefFghiLmop:rRsV"
@@ -1565,7 +1560,7 @@ if [ "$CLEANCACHE" -eq 1 ]; then
 	if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then
 		msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST"
 		echo -n "$(gettext "    Are you sure you wish to do this? ")"
-		echo -n "$(gettext "[Y/n]")"
+		echo -n "$(gettext "[y/N]")"
 		read answer
 		answer=$(echo $answer | tr '[:lower:]' '[:upper:]')
 		if [ "$answer" = "$(gettext "YES")" -o "$answer" = "$(gettext "Y")" ]; then
@@ -1876,9 +1871,9 @@ else
 		msg "$(gettext "Entering fakeroot environment...")"
 
 		if [ -n "$newpkgver" ]; then
-			fakeroot -- $0 --forcever $newpkgver -F $ARGLIST || exit $?
+			fakeroot -- $0 --forcever $newpkgver -F "${ARGLIST[@]}" || exit $?
 		else
-			fakeroot -- $0 -F $ARGLIST || exit $?
+			fakeroot -- $0 -F "${ARGLIST[@]}" || exit $?
 		fi
 	fi
 fi

src/pacman/util.c

@@ -174,7 +174,8 @@ int rmrf(const char *path)
 			return(1);
 		}
 
-		if((dirp = opendir(path)) == (DIR *)-1) {
+		dirp = opendir(path);
+		if(!dirp) {
 			return(1);
 		}
 		for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {