Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=52980c1a56fd234a098a23691f5dfbf1cbf46275
commit 52980c1a56fd234a098a23691f5dfbf1cbf46275 Merge: 7238a61 7f05f89 Author: Elentir <elen...@frugalware.org> Date: Thu Mar 3 16:45:16 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/base/pam-frugalware/FrugalBuild diff --cc source/base-extra/sysvinit/FrugalBuild index 3cdc733,2e9e9b1..305878f --- a/source/base-extra/sysvinit/FrugalBuild +++ b/source/base-extra/sysvinit/FrugalBuild @@@ -20,9 -20,9 +20,9 @@@ source=(http://download.savannah.gnu.or subpkgs=("${subpkgs[@]}" "$pkgname-initscripts") subdescs=("${subdescs[@]}" 'System V init scripts.') - subdepends=("${subdepends[@]}" 'bash chkconfig coreutils>=6.12-2 gawk>=3.1.6-3 shadow>=4.1.2.1-2 util-linux-ng>=2.14-2') + subdepends=("${subdepends[@]}" 'bash chkconfig coreutils>=6.12-2 gawk>=3.1.6-3 shadow>=4.1.2.1-2 util-linux') subgroups=("${subgroups[@]}" 'base') -subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc arm') subbackup=("${subbackup[@]}" 'etc/{inittab,rc.d/rc.local}') subinstall=("${subinstall[@]}" "$pkgname-initscripts.install") diff --cc source/base/e2fsprogs/FrugalBuild index 0cf55df,2386f05..bac22f7 --- a/source/base/e2fsprogs/FrugalBuild +++ b/source/base/e2fsprogs/FrugalBuild @@@ -3,12 -3,12 +3,12 @@@ pkgname=e2fsprogs pkgver=1.41.14 - pkgrel=1 + pkgrel=2 pkgdesc="Utilities needed to create and maintain ext2 and ext3 filesystems" - depends=('glibc>=2.8-3' 'util-linux-ng>=2.16') + depends=('glibc>=2.8-3' 'util-linux') rodepends=('coreutils>=6.12-2') groups=('base' 'chroot-core') -archs=('i686' 'x86_64' 'ppc') +archs=('i686' 'x86_64' 'ppc' 'arm') _F_sourceforge_prefix="libs-" Finclude sourceforge url="http://e2fsprogs.sourceforge.net/"; diff --cc source/base/less/FrugalBuild index 3a788d4,3ae29a9..74b5bb2 --- a/source/base/less/FrugalBuild +++ b/source/base/less/FrugalBuild @@@ -8,10 -8,10 +8,10 @@@ pkgdesc="A paginator similar to more url="http://www.greenwoodsoftware.com/less"; depends=('ncurses>=5.6-4' 'bash' 'file>=4.25-2') groups=('base') -archs=('i686' 'x86_64' 'ppc') +archs=('i686' 'x86_64' 'ppc' 'arm') up2date="lynx -dump http://www.greenwoodsoftware.com/less/download.html |grep -m 1 .tar.gz | Flasttar" source=($url/$pkgname-$pkgver.tar.gz lesspipe.sh less.sh) - sha1sums=('4a8a395117e97f2710ed68c4cfdab9ddd9a228ce' \ + sha1sums=('241136cc2c7f75c58ad9d1b73f783d5a6aa10d8c' \ '3e7e305a7eec7d3a52fd994f93c6065a71319086' \ '167bfbea39f7d22e153b7ab22606d87cfb60f518') diff --cc source/base/openssl/FrugalBuild index d1ddd0b,68656c9..9e9f143 --- a/source/base/openssl/FrugalBuild +++ b/source/base/openssl/FrugalBuild @@@ -9,9 -9,9 +9,9 @@@ pkgrel= pkgdesc="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" url="http://www.openssl.org/source/"; groups=('base' 'chroot-core') -archs=('i686' 'x86_64' 'ppc') +archs=('i686' 'x86_64' 'ppc' 'arm') depends=('glibc>=2.8-3') - makedepends=('util-linux-ng>=2.14-2') + makedepends=('util-linux') up2date="lynx -source http://www.openssl.org/source/ |grep LATEST|sed -n 's/.*-\(.*\)\.t.*/\1/;s/$pkgextraver//;1 p'" source=($url$pkgname-$pkgver$pkgextraver.tar.gz \ http://caunter.ca/ssl.certs.shar man_symlinks.diff) diff --cc source/base/pam-frugalware/FrugalBuild index 9572efe,0012d2b..85fb8ac --- a/source/base/pam-frugalware/FrugalBuild +++ b/source/base/pam-frugalware/FrugalBuild @@@ -10,9 -10,9 +10,9 @@@ source=(http://ftp.frugalware.org/pub/o up2date="Flasttar http://ftp.frugalware.org/pub/other/people/bouleetbil/sources/"; depends=('pam') groups=('base' 'chroot-core') -archs=('i686' 'x86_64' 'ppc') +archs=('i686' 'x86_64' 'ppc' 'arm') - backup=(etc/pam.d/{system-auth,system-login,system-local-login,system-remote-login,system-services,other}) - sha1sums=('f9fc1c6e37f2e7a7a6134a61ef4ec2284b2fc13b') + backup=(etc/pam.d/{system-auth,system-login,system-local-login,system-remote-login,system-services,other,login-manager}) + sha1sums=('986e69a73c57b128032729a195f6a5e293412d54') build(){ Fcd _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
