diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | libre/acpi_call/PKGBUILD | 9 | ||||
| -rw-r--r-- | pcr/ffingerd/PKGBUILD | 39 | ||||
| -rw-r--r-- | pcr/monkeysphere/PKGBUILD | 19 | ||||
| -rw-r--r-- | pcr/monkeysphere/monkeysphere.install | 25 |
5 files changed, 50 insertions, 43 deletions
diff --git a/.gitignore b/.gitignore index f62b59bb0..6422ba9a4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ src/ pkg/ src-libre/ pkg-libre/ +grsecurity*.patch* *.deb *.log *.tar* diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index a8f98fc8f..2bb18f24b 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -68,6 +68,15 @@ install='kmod.install' source=("${url}/archive/v${pkgver}.tar.gz") sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + if [[ ${_basekernel} > 3.16 ]]; then + # Fix build with Linux-libre 3.17-gnu + sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c + fi +} + build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/pcr/ffingerd/PKGBUILD b/pcr/ffingerd/PKGBUILD index 5b43314d3..ebe94ddd3 100644 --- a/pcr/ffingerd/PKGBUILD +++ b/pcr/ffingerd/PKGBUILD @@ -1,27 +1,36 @@ pkgname=ffingerd pkgver=1.28 -pkgrel=3 -pkgdesc="Secure finger daemon" -arch=('i686' 'x86_64' 'mips64el') +pkgrel=4 +pkgdesc="secure finger daemon" +arch=('i686' 'x86_64') url="http://www.fefe.de/ffingerd/" license=('GPL2') depends=('glibc' 'xinetd') -backup=('etc/xinetd.d/finger') -source=(http://www.fefe.de/$pkgname/$pkgname-$pkgver.tar.bz2 finger.xinetd) -md5sums=('fe207448745da07b4e393d8b8694658b' '2ca1a6b3f442a5c0c81fa03d265a203e') +backup=('etc/xinetd.d/ffinger') +source=(http://www.fefe.de/$pkgname/$pkgname-$pkgver.tar.bz2 + finger.xinetd) +md5sums=('fe207448745da07b4e393d8b8694658b' + '2ca1a6b3f442a5c0c81fa03d265a203e') -build() { - cd $srcdir/$pkgname-$pkgver - install -d $pkgdir/usr/sbin $pkgdir/usr/share/man/man8 - ./configure --prefix=/usr +prepare() { + cd "$srcdir/$pkgname-$pkgver" + install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man8" - make + echo "ac_cv_header_sys_syslog_h=yes" >>config.cache + echo "ac_cv_header_arpa_inet_h=yes" >>config.cache + echo "ac_cv_header_sys_errno_h=yes" >>config.cache } -package(){ - cd $srcdir/$pkgname-$pkgver +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + + make +} - make SBINDIR=$pkgdir/usr/sbin MANDIR=$pkgdir/usr/share/man install +package() { + cd "$srcdir/$pkgname-$pkgver" - install -D -m644 $srcdir/finger.xinetd $pkgdir/etc/xinetd.d/ffinger + make SBINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" install + install -D -m644 "$srcdir/finger.xinetd" "$pkgdir/etc/xinetd.d/ffinger" } diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD index 867ae171e..48f55dbfd 100644 --- a/pcr/monkeysphere/PKGBUILD +++ b/pcr/monkeysphere/PKGBUILD @@ -1,15 +1,16 @@ # Contributor: fauno <fauno@kiwwwi.com.ar> # Based on monkeysphere-git from -# Contributor (Arch): Olivier Mehani <shtrom-arch@ssji.net> +# Contributor: Olivier Mehani <shtrom-arch@ssji.net> # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ pkgname=monkeysphere -pkgver=0.36 +pkgver=0.37 pkgrel=1 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication" arch=('any') url="http://web.monkeysphere.info/" license=('GPL3') depends=('gnupg' 'lockfile-progs' 'perl-crypt-openssl-rsa' 'perl-digest-sha1') +checkdepends=('socat' 'openssh' 'cpio') source=(http://archive.monkeysphere.info/debian/pool/${pkgname}/m/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz binmerge.patch) install=monkeysphere.install @@ -21,11 +22,11 @@ prepare() { } # Checks fail -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# -# make test -#} +check() { + cd "$srcdir/$pkgname-$pkgver" + + make test || true +} package() { cd "$srcdir/$pkgname-$pkgver" @@ -37,3 +38,7 @@ sha1sums=('c4f950346040f7703cb4c6e8b32022f4361d0c9d' '780c2e203980558316b0714c4b2a3ad49be3ea27') sha256sums=('6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7' 'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7') +sha1sums=('1fab51ae4c1a19d8bbc358db8e2ce7df337cc93e' + '780c2e203980558316b0714c4b2a3ad49be3ea27') +sha256sums=('b510b8a414fb400356e80f1f882488785df72ac54078410b54d4c50a84686e59' + 'e49a1097296b06090010ce5344588f5e4917aeb06a118de920fc58411d2a7cf7') diff --git a/pcr/monkeysphere/monkeysphere.install b/pcr/monkeysphere/monkeysphere.install index 2013f9f41..df25cbda5 100644 --- a/pcr/monkeysphere/monkeysphere.install +++ b/pcr/monkeysphere/monkeysphere.install @@ -3,15 +3,10 @@ # vim:set ts=2 sw=2 et: # arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version post_install() { echo ">>> Creating monkeysphere user and group and setting permissions..." - getent group monkeysphere >/dev/null || usr/sbin/groupadd monkeysphere - getent passwd monkeysphere >/dev/null || usr/sbin/useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere + getent group monkeysphere >/dev/null || groupadd monkeysphere + getent passwd monkeysphere >/dev/null ||useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere # Should be root:root for sshd to work chown root:root /var/lib/monkeysphere @@ -19,12 +14,6 @@ post_install() { # arg 1: the new package version # arg 2: the old package version -pre_upgrade() { - /bin/true -} - -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { # Should be root:root for sshd to work chown root:root /var/lib/monkeysphere @@ -32,12 +21,6 @@ post_upgrade() { # arg 1: the old package version pre_remove() { - usr/sbin/userdel monkeysphere &>/dev/null - (getent group monkeysphere >/dev/null && usr/sbin/groupdel monkeysphere &>/dev/null) || /bin/true + userdel monkeysphere &>/dev/null + (getent group monkeysphere >/dev/null && groupdel monkeysphere &>/dev/null) || /bin/true } - -# arg 1: the old package version -post_remove() { - /bin/true -} - |