diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-05-31 10:31:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-05-31 10:31:40 -0300 |
| commit | 4a7e8d190fab934c66887944e53ab776b2bc79eb (patch) | |
| tree | 069551615194c52664585a35d73efdfb6e73a2fe | |
| parent | c4ec984eb510cec5a0619bc40e3c0b7eb19204a3 (diff) | |
| parent | e6aefddf94f8b3f7aa323154f3a044d96a68a70f (diff) | |
| download | abslibre-4a7e8d190fab934c66887944e53ab776b2bc79eb.tar.gz abslibre-4a7e8d190fab934c66887944e53ab776b2bc79eb.tar.bz2 abslibre-4a7e8d190fab934c66887944e53ab776b2bc79eb.zip | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre
| -rw-r--r-- | libre/your-freedom/PKGBUILD | 10 | ||||
| -rw-r--r-- | social/haveged/PKGBUILD | 18 |
2 files changed, 16 insertions, 12 deletions
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 83f9070fc..df53ec0cb 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Parabola Project <dev@list.parabolagnulinux.org> pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=1 +pkgrel=3 pkgdesc="This package conflicts with every unfree package known to date." arch=('any') -url="http://parabolagnulinux.org" +url="https://parabolagnulinux.org" license=('GPL') groups=('base') install=${pkgname}.install @@ -21,5 +21,9 @@ build() { } package() { - conflicts=($(cut -d: -f1 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt)) + conflicts=($(cut -d: -f1,2 ${pkgdir}/usr/share/doc/${pkgname}/blacklist.txt | \ + sed "s/:$//" | \ + grep -v ":" | \ + sort -u + )) } diff --git a/social/haveged/PKGBUILD b/social/haveged/PKGBUILD index 804a22199..b5f2e680a 100644 --- a/social/haveged/PKGBUILD +++ b/social/haveged/PKGBUILD @@ -1,28 +1,28 @@ -# Maintainer: pootzko <pootzko@gmail.com> -# Contributor: kfgz <kfgz@interia.pl> +# Maintainer: kfgz <kfgz at interia dot pl> +# Contributor: pootzko <pootzko at gmail dot com> pkgname=haveged -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="A simple entropy daemon." arch=('i686' 'x86_64') url="http://www.issihosts.com/haveged" license="GPL" -depends=() source=(${url}/${pkgname}-${pkgver}.tar.gz - haveged) -md5sums=('72df03658cafac35e087fb75f6d4100d' + haveged) +md5sums=('f7752f0355a0e89d8f196658db5f6884' '264b725be5271288b40f363d7cfc6b68') - build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/etc/init.d cd ${srcdir} install -D -m755 haveged ${pkgdir}/etc/rc.d/haveged } - - |