diff --git a/Makefile b/Makefile index f60a9aafe6211083d8a6bc28fef26efd5b640717..215679a2397b949e465dd855bf1cc000c007ea46 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -V=20120114 +V=20120118 PREFIX = /usr/local diff --git a/archbuild.in b/archbuild.in index 4e16d1fa58104011c28836df5e85914f10c1a552..122f1e019e93ae49f206f31de382ef9fa6e4cef5 100644 --- a/archbuild.in +++ b/archbuild.in @@ -2,8 +2,7 @@ m4_include(lib/common.sh) -# FIXME: temporary added curl until pacman 4.0 moves to [core] -base_packages=(base base-devel sudo curl) +base_packages=(base base-devel sudo) cmd="${0##*/}" if [[ "${cmd%%-*}" == 'multilib' ]]; then @@ -53,15 +52,6 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then done exec 9>&- - # FIXME: temporary workaround until pacman 4.0 moves to [core] - if pacman -V | grep -q 'v4.' && ( [[ "$repo" == 'extra' || "$repo" == 'multilib' ]] ); then - pacman_conf=$(mktemp) - cp "@pkgdatadir@/pacman-${repo}.conf" "${pacman_conf}" - sed -r 's/^#(SigLevel = Never)/\1/' -i "${pacman_conf}" - else - pacman_conf="@pkgdatadir@/pacman-${repo}.conf" - fi - rm -rf "${chroots}/${repo}-${arch}" mkdir -p "${chroots}/${repo}-${arch}" setarch "${arch}" mkarchroot \ @@ -69,11 +59,6 @@ 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] - if pacman -V | grep -q 'v4.' && ( [[ "$repo" == 'extra' || "$repo" == 'multilib' ]] ); then - cp "@pkgdatadir@/pacman-${repo}.conf" "${chroots}/${repo}-${arch}/root/etc/pacman.conf" - fi else setarch ${arch} mkarchroot \ -u \ diff --git a/pacman-extra.conf b/pacman-extra.conf index c0b777174368380ecef13433c5bd103bb371c703..4c5051337a27498525449f0d4f83812f5fd3ada5 100644 --- a/pacman-extra.conf +++ b/pacman-extra.conf @@ -47,8 +47,8 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now -#SigLevel = Never +# For now, off by default unless you read the above. +SigLevel = Never # # REPOSITORIES diff --git a/pacman-gnome-unstable.conf b/pacman-gnome-unstable.conf index 40b18f4b6676810e59b0240c517fb68a92ab2d51..04e8f5b01647182a61cb11508ab3d490d16195d9 100644 --- a/pacman-gnome-unstable.conf +++ b/pacman-gnome-unstable.conf @@ -47,7 +47,7 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now +# For now, off by default unless you read the above. SigLevel = Never # diff --git a/pacman-kde-unstable.conf b/pacman-kde-unstable.conf index 42f073d849b2ee1393608a9165761ce5a3e69d77..e5b95bba7e0b3430e8dbec2ea85b87e8a7763601 100644 --- a/pacman-kde-unstable.conf +++ b/pacman-kde-unstable.conf @@ -47,7 +47,7 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now +# For now, off by default unless you read the above. SigLevel = Never # diff --git a/pacman-multilib-staging.conf b/pacman-multilib-staging.conf index 1e9cfd5f71019df6d022e0f5cfffd3bc44959f48..a088010c79a581b5c5890b0137c62a640678875a 100644 --- a/pacman-multilib-staging.conf +++ b/pacman-multilib-staging.conf @@ -47,7 +47,7 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now +# For now, off by default unless you read the above. SigLevel = Never # diff --git a/pacman-multilib-testing.conf b/pacman-multilib-testing.conf index b7e59f6f8f7099b6ae11897927383cf367bee348..ee9c98886aea16290eb68c795ffa94c71c419f1a 100644 --- a/pacman-multilib-testing.conf +++ b/pacman-multilib-testing.conf @@ -47,7 +47,7 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now +# For now, off by default unless you read the above. SigLevel = Never # diff --git a/pacman-multilib.conf b/pacman-multilib.conf index 5dada55177e4aedf1a80d63229477f78e91c0532..696003e62a8ab34eba002a4cf4f9984946f47822 100644 --- a/pacman-multilib.conf +++ b/pacman-multilib.conf @@ -47,8 +47,8 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now -#SigLevel = Never +# For now, off by default unless you read the above. +SigLevel = Never # # REPOSITORIES diff --git a/pacman-staging.conf b/pacman-staging.conf index 9d8e23e245b7492eda50b93bda480c1c31964637..4ef48de3031c0e59be197f40966cdd565ab806e8 100644 --- a/pacman-staging.conf +++ b/pacman-staging.conf @@ -47,7 +47,7 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now +# For now, off by default unless you read the above. SigLevel = Never # diff --git a/pacman-testing.conf b/pacman-testing.conf index 70b024983fcbd2fcac0da09a8fc85f7e68fc0f71..cc007e36d9b0bf84fc7ff915ffe62848edac842d 100644 --- a/pacman-testing.conf +++ b/pacman-testing.conf @@ -47,7 +47,7 @@ Architecture = auto # the following line. This will treat any key imported into pacman's keyring as # trusted. #SigLevel = Optional TrustAll -# Disable signature checks for now +# For now, off by default unless you read the above. SigLevel = Never #