summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2012-01-18 11:24:07 +0100
committerPierre Schmitz <pierre@archlinux.de>2012-01-18 11:24:07 +0100
commitee4edefa2f12372adb4793c0dd6420fc76911ae4 (patch)
treea7f0d9569fe988813504b2ba5befb4585358aa19
parenta8b64995ee6ee32285cc4f33f127a094b8a63fff (diff)
Remove any pacman 4 related workarounds20120118
-rw-r--r--Makefile2
-rw-r--r--archbuild.in17
-rw-r--r--pacman-extra.conf4
-rw-r--r--pacman-gnome-unstable.conf2
-rw-r--r--pacman-kde-unstable.conf2
-rw-r--r--pacman-multilib-staging.conf2
-rw-r--r--pacman-multilib-testing.conf2
-rw-r--r--pacman-multilib.conf4
-rw-r--r--pacman-staging.conf2
-rw-r--r--pacman-testing.conf2
10 files changed, 12 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index f60a9aa..215679a 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 4e16d1f..122f1e0 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 c0b7771..4c50513 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 40b18f4..04e8f5b 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 42f073d..e5b95bb 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 1e9cfd5..a088010 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 b7e59f6..ee9c988 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 5dada55..696003e 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 9d8e23e..4ef48de 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 70b0249..cc007e3 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
#