Merge branch 'maint'

6 files changed, 18 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index 7fd6df11..743028c0 100644
--- a/NEWS
+++ b/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
diff --git a/configure.ac b/configure.ac
index dada0dd8..80e41a6e 100644
--- a/configure.ac
+++ b/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])
 
diff --git a/doc/index.txt b/doc/index.txt
index 8cd9b414..646a5dce 100644
--- a/doc/index.txt
+++ b/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
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index d9108096..cf2d6236 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -389,7 +389,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)) {
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 92b04546..25fb8d93 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1315,7 +1315,7 @@ devel_update() {
 backup_package_variables() {
 	for var in ${splitpkg_overrides[@]}; do
 		indirect="${var}_backup"
-		eval "${indirect}=(\${$var[@]})"
+		eval "${indirect}=(\"\${$var[@]}\")"
 	done
 }
 
@@ -1323,16 +1323,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
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 1143befd..115b3673 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -122,7 +122,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)) {