From 758bdae62cd02aa460b784c5c1a03123bb4c036f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 23 Mar 2012 15:22:42 +0000 Subject: main/alpine-conf: upgrade to 2.10.0 --- ...acf-use-acfpasswd-utility-to-set-password.patch | 35 ------------- ...setup-disk-fix-booting-from-cciss-devices.patch | 31 ------------ ...fix-compaq-server-disk-arrays-dev-cciss-c.patch | 58 ---------------------- main/alpine-conf/APKBUILD | 12 ++--- 4 files changed, 3 insertions(+), 133 deletions(-) delete mode 100644 main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch delete mode 100644 main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch delete mode 100644 main/alpine-conf/0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch (limited to 'main') diff --git a/main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch b/main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch deleted file mode 100644 index 9f0aec603..000000000 --- a/main/alpine-conf/0001-setup-acf-use-acfpasswd-utility-to-set-password.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3ed9c1d7846d62d6a83b5f9d9f93cbfe2c515ef7 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Thu, 12 Jan 2012 11:55:21 +0000 -Subject: [PATCH] setup-acf: use acfpasswd utility to set password - ---- - setup-acf.in | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/setup-acf.in b/setup-acf.in -index 487db00..9e1489f 100644 ---- a/setup-acf.in -+++ b/setup-acf.in -@@ -31,16 +31,13 @@ while [ $# -gt 0 ]; do - done - - if [ "$create_passwd" != "no" ]; then -- askpassword "root ACF" - mkdir -p /etc/acf - if [ -f /etc/acf/passwd ]; then - mv /etc/acf/passwd /etc/acf/passwd.backup - fi -- # this will show password on process list but we assume user is alone -- # on the box at this stage -- _md5passwd=$(echo -n "$_password" | md5sum | cut -d' ' -f1) -- echo "root:$_md5passwd:Admin account:ADMIN" >/etc/acf/passwd -+ echo "root:x:Admin account:ADMIN" >/etc/acf/passwd - chmod 600 /etc/acf/passwd -+ acfpasswd -s root - fi - - # install packages --- -1.7.8.3 - diff --git a/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch b/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch deleted file mode 100644 index ff04c5d44..000000000 --- a/main/alpine-conf/0001-setup-disk-fix-booting-from-cciss-devices.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 631c361640d22e40d19b43d3b1e63b4da84ad18a Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Tue, 8 Nov 2011 09:22:53 +0000 -Subject: [PATCH] setup-disk: fix booting from cciss devices - ---- - setup-disk.in | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/setup-disk.in b/setup-disk.in -index a2b610f..6f49e6a 100644 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -206,6 +206,14 @@ install_mounted_root() { - raid[456]) raidmod="$raidmod,raid456";; - esac - done -+ -+ # check if we need hardware raid drivers -+ case $rootdev in -+ /dev/cciss/*) -+ initfs_features="$(echo $initfs_features | sed 's/raid//') raid" -+ ;; -+ esac -+ - if [ -n "$VERBOSE" ]; then - echo "Root device: $rootdev" - echo "Root filesystem: $root_fs" --- -1.7.7.2 - diff --git a/main/alpine-conf/0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch b/main/alpine-conf/0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch deleted file mode 100644 index bef005ae1..000000000 --- a/main/alpine-conf/0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch +++ /dev/null @@ -1,58 +0,0 @@ -From a8e3f8ca13a03356b89d096b25c7e9223aae89c8 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Mon, 7 Nov 2011 14:01:23 +0000 -Subject: [PATCH] setup-disk: fix compaq server disk arrays /dev/cciss/c0d0 - style disks - ---- - setup-disk.in | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) - -diff --git a/setup-disk.in b/setup-disk.in -index 33ab925..a2b610f 100644 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -292,7 +292,8 @@ find_swap_size() { - local size=$(( $memtotal_kb * 2 / 1024 )) - local disk= disksize= - for disk in $@; do -- local sysfspath=/sys/block/${disk#/dev/}/size -+ local sysfsdev=$(echo ${disk#/dev/} | sed 's:/:!:g') -+ local sysfspath=/sys/block/$sysfsdev/size - # disksize = x * 512 / (1024 * 1024) = x / 2048 - # maxsize = $disksize / 4 = x / (2048 * 4) = x / 8192 - maxsize=$(awk '{ printf "%i", $0 / 8192 }' $sysfspath ) -@@ -312,11 +313,12 @@ find_swap_size() { - - has_mounted_part() { - local p -+ local sysfsdev=$(echo ${1#/dev/} | sed 's:/:!:g') - # parse /proc/mounts for mounted devices -- for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); print $1}' \ -+ for p in $(awk '$1 ~ /^\/dev\// {gsub("/dev/", "", $1); gsub("/", "!", $1); print $1}' \ - /proc/mounts); do -- [ "$p" = "$1" ] && return 0 -- [ -e /sys/block/$1/$p ] && return 0 -+ [ "$p" = "$sysfsdev" ] && return 0 -+ [ -e /sys/block/$sysfsdev/$p ] && return 0 - done - return 1 - } -@@ -376,11 +378,12 @@ init_progs() { - show_disk_info() { - local disk= vendor= model= d= size= - for disk in $@; do -- d=${disk##*/} -+ local dev=${disk#/dev/} -+ d=$(echo $dev | sed 's:/:!:g') - vendor=$(cat /sys/block/$d/device/vendor 2>/dev/null) - model=$(cat /sys/block/$d/device/model 2>/dev/null) - size=$(awk '{gb = ($1 * 512)/1000000000; printf "%.1f GB\n", gb}' /sys/block/$d/size 2>/dev/null) -- echo " $d ($size $vendor $model)" -+ echo " $dev ($size $vendor $model)" - done - } - --- -1.7.7.2 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 51ad201e7..85167faaa 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,14 +1,11 @@ # Maintainer: Natanael Copa pkgname=alpine-conf -pkgver=2.9.3 -pkgrel=3 +pkgver=2.10.0 +pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname depends="openrc" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch - 0001-setup-disk-fix-booting-from-cciss-devices.patch - 0001-setup-acf-use-acfpasswd-utility-to-set-password.patch " arch="all" @@ -39,7 +36,4 @@ package() { ln -s lbu "$pkgdir"/sbin/lbu_$i done } -md5sums="5252c8ff669b91f0c7a5cbdf0b9b7552 alpine-conf-2.9.3.tar.bz2 -35287e6f69886ebfd762be07737943a2 0001-setup-disk-fix-compaq-server-disk-arrays-dev-cciss-c.patch -1594f8b3a3e27bffa83a1632b49f4d6d 0001-setup-disk-fix-booting-from-cciss-devices.patch -eb3e6b8bee0060022149368e01006f03 0001-setup-acf-use-acfpasswd-utility-to-set-password.patch" +md5sums="41770f37b79868aec34ce5f2b03c495b alpine-conf-2.10.0.tar.bz2" -- cgit v1.2.3