prepare release

temporary workaround until pacman 4.0 moves to [core]
Pacman 3 refuses to work with the pacman 4 SigLevel config entry Also related: https://bugs.archlinux.org/task/26555
2025-09-13 01:46:19 +02:00 · 2011-10-29 21:53:36 +02:00 · 2011-10-29 21:46:19 +02:00 · 2011-10-29 20:37:28 +02:00 · 2011-10-29 13:19:10 +02:00 · 2011-10-29 13:05:09 +02:00
9 changed files with 38 additions and 14 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-V=0.9.28
+V=0.9.30

 PREFIX = /usr/local

--- a/archbuild.in
+++ b/archbuild.in
@@ -58,6 +58,13 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then
 		-M "@pkgdatadir@/makepkg-${arch}.conf" \
 		"${chroots}/${repo}-${arch}/root" \
 		"${base_packages[@]}"
+
+	# FIXME: temporary workaround until pacman 4.0 moves to [core]
+	case $repo in
+		core|extra|community|multilib)
+			sed -r '/^SigLevel.*/d' -i "${chroots}/${repo}-${arch}/root/etc/pacman.conf"
+		;;
+	esac
 else
 	setarch ${arch} mkarchroot \
 		-u \
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -86,14 +86,13 @@ done

 # check if changelog and install files are under version control
 for i in 'changelog' 'install'; do
-	filelist=$(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
-	for file in $filelist; do
+	while read -r file; do
 		# evaluate any bash variables used
-		eval file=${file}
+		eval file=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$file")\"
 		if ! svn status -v "${file}" | grep -q '^[ AMRX~]'; then
 			abort "${file} is not under version control"
 		fi
-	done
+	done < <(sed -n "s/^[[:space:]]*$i=//p" PKGBUILD)
 done

 # see if any limit options were passed, we'll send them to rsync
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -173,11 +173,18 @@ mkdir -p "$copydir/build"
 # Remove anything in there UNLESS -R (repack) was passed to makepkg
 $repack || rm -rf "$copydir"/build/*

-# Read .makepkg.conf even if called via sudo
+# Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo
 if [[ -n $SUDO_USER ]]; then
-	makepkg_conf="$(eval echo ~$SUDO_USER)/.makepkg.conf"
+	SUDO_HOME="$(eval echo ~$SUDO_USER)"
+	makepkg_conf="$SUDO_HOME/.makepkg.conf"
+	if [[ -r "$SUDO_HOME/.gnupg/pubring.gpg" ]]; then
+		install -D "$SUDO_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
+	fi
 else
 	makepkg_conf="$HOME/.makepkg.conf"
+	if [[ -r "$HOME/.gnupg/pubring.gpg" ]]; then
+		install -D "$HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
+	fi
 fi

 # Get SRC/PKGDEST from makepkg.conf
@@ -247,9 +254,15 @@ cp PKGBUILD "$copydir/build/"

 chown -R nobody "$copydir"/{build,pkgdest,srcdest}

-echo 'nobody ALL = NOPASSWD: /usr/bin/pacman' > "$copydir/etc/sudoers.d/nobody-pacman"
+cat > "$copydir/etc/sudoers.d/nobody-pacman" <<EOF
+Defaults env_keep += "HOME"
+nobody ALL = NOPASSWD: /usr/bin/pacman
+EOF
 chmod 440 "$copydir/etc/sudoers.d/nobody-pacman"

+# Set this system wide as makepkg will source /etc/profile before calling build()
+echo 'export LANG=C' > "$copydir/etc/locale.conf"
+
 # This is a little gross, but this way the script is recreated every time in the
 # working copy
 cat >"$copydir/chrootbuild" <<EOF
--- a/pacman-extra.conf
+++ b/pacman-extra.conf
@@ -33,7 +33,8 @@ Architecture = auto
 #UseSyslog
 #UseDelta
 #TotalDownload
-CheckSpace
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 #VerbosePkgLists

 # PGP signature checking
@@ -45,7 +46,7 @@ CheckSpace
 # If you wish to check signatures but avoid local sign and trust issues, use
 # the following line. This will treat any key imported into pacman's keyring as
 # trusted.
-SigLevel = Optional TrustAll
+#SigLevel = Optional TrustAll
 # Disable signature checks for now
 SigLevel = Never

--- a/pacman-multilib-testing.conf
+++ b/pacman-multilib-testing.conf
@@ -33,7 +33,8 @@ Architecture = auto
 #UseSyslog
 #UseDelta
 #TotalDownload
-CheckSpace
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 #VerbosePkgLists

 # PGP signature checking
--- a/pacman-multilib.conf
+++ b/pacman-multilib.conf
@@ -33,7 +33,8 @@ Architecture = auto
 #UseSyslog
 #UseDelta
 #TotalDownload
-CheckSpace
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 #VerbosePkgLists

 # PGP signature checking
--- a/pacman-staging.conf
+++ b/pacman-staging.conf
@@ -33,7 +33,8 @@ Architecture = auto
 #UseSyslog
 #UseDelta
 #TotalDownload
-CheckSpace
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 #VerbosePkgLists

 # PGP signature checking
--- a/pacman-testing.conf
+++ b/pacman-testing.conf
@@ -33,7 +33,8 @@ Architecture = auto
 #UseSyslog
 #UseDelta
 #TotalDownload
-CheckSpace
+# We cannot check disk space from within a chroot environment
+#CheckSpace
 #VerbosePkgLists

 # PGP signature checking
Author	SHA1	Message	Date
Pierre Schmitz	01f5cdf33d	prepare release	2011-10-29 21:53:36 +02:00
Pierre Schmitz	e333a4da81	temporary workaround until pacman 4.0 moves to [core] Pacman 3 refuses to work with the pacman 4 SigLevel config entry Also related: https://bugs.archlinux.org/task/26555	2011-10-29 21:46:19 +02:00
Pierre Schmitz	86045b965e	makechrootpkg: Make host pubring.gpg available to check signed sources	2011-10-29 20:37:28 +02:00
Lukas Fleischer	bea69043fb	commitpkg: Sync changelog/install check with makepkg(8) makepkg(8) currently uses a smarter method to extract all changelog and install files from a PKGBUILD. Sync commitpkg to use the same code (with small modifications). This also adds support for changelog/install files that contain a whitespace. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>	2011-10-29 13:19:10 +02:00
Pierre Schmitz	521c4ceec3	makechrootpkg: Set the C locale system wide makepkg sources /etc/profile before calling build(). This will change the locale from C to en_US.UTF8.	2011-10-29 13:05:09 +02:00
Pierre Schmitz	3a684f667b	prepare release	2011-10-14 10:18:56 +02:00
Pierre Schmitz	ae7b13646e	Disable pacman's CheckSpace option as it fails within a chroot	2011-10-14 10:16:55 +02:00