diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/cryptsetup/PKGBUILD | 6 | ||||
-rw-r--r-- | core/dhcpcd/PKGBUILD | 16 | ||||
-rw-r--r-- | core/dhcpcd/dhcpcd.service | 13 | ||||
-rw-r--r-- | core/e2fsprogs/PKGBUILD | 6 | ||||
-rw-r--r-- | core/iptables/PKGBUILD | 15 | ||||
-rw-r--r-- | core/net-tools/Makefile.patch | 17 | ||||
-rw-r--r-- | core/net-tools/PKGBUILD | 30 |
7 files changed, 63 insertions, 40 deletions
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 156f43113..27c7591c2 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164359 2012-07-31 19:25:50Z tomegun $ +# $Id: PKGBUILD 165243 2012-08-14 08:44:57Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -17,7 +17,7 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt make } diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index ce8ac114e..427609e39 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 155703 2012-04-05 10:02:36Z ronald $ +# $Id: PKGBUILD 165283 2012-08-14 20:43:47Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.5.6 +pkgver=5.6.0 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" -url="http://roy.marples.name/dhcpcd/" +url="http://roy.marples.name/projects/dhcpcd/" arch=('i686' 'x86_64') license=('BSD') groups=('base') @@ -15,9 +15,10 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d') -sha1sums=('7f9ca207bce051252c0acb6a6cae3de22babcb20' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0') + 'dhcpcd.conf.d' 'dhcpcd.service') +sha1sums=('28ad6931393420a72da307ee173466a9e00cd952' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + '3d0542eab1b89a88d56ca427128228ac72c40d1f') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -48,4 +49,7 @@ package() { # Set Options in /etc/dhcpcd.conf echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall + + # install systemd files + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service } diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service new file mode 100644 index 000000000..25a1923ac --- /dev/null +++ b/core/dhcpcd/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd-%I.pid +ExecStart=/sbin/dhcpcd -A -q -w %I +ExecStop=/sbin/dhcpcd -k %I + +[Install] +Alias=multi-user.target.wants/dhcpcd@eth0.service diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 96afe85d7..ddf46799b 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162199 2012-06-23 12:13:06Z ronald $ +# $Id: PKGBUILD 165284 2012-08-14 20:43:58Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.4 +pkgver=1.42.5 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' +sha1sums=('41bc6d247238eac65864193e6de941956da493cb' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index cc6e506e1..e8cc3b315 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164210 2012-07-27 14:54:09Z ibiru $ +# $Id: PKGBUILD 165282 2012-08-14 20:43:06Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.14 -pkgrel=3 +pkgver=1.4.15 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -24,12 +24,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules 0503-extension_cppflags.patch - iptables-1.4.12-fixresore.patch iptables.service ip6tables.service iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' +sha1sums=('56ab3b143af2ad443c9652db3a38ef8869cd2207' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -41,7 +40,6 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -54,11 +52,6 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch - # Fix scope issue exposed by gcc 4.7 (patch by fryasu) - # http://bugzilla.netfilter.org/show_bug.cgi?id=774 - # (This will most likely be fixed in iptables 1.4.15) - patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch - ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/core/net-tools/Makefile.patch b/core/net-tools/Makefile.patch new file mode 100644 index 000000000..aaacd6b78 --- /dev/null +++ b/core/net-tools/Makefile.patch @@ -0,0 +1,17 @@ +--- Makefile.old 2012-08-07 22:07:58.235437087 +0200 ++++ Makefile 2012-08-07 22:10:21.192104345 +0200 +@@ -239,12 +239,12 @@ + install -m 0755 -d ${BASEDIR}/bin + install -m 0755 arp ${BASEDIR}/sbin + install -m 0755 hostname ${BASEDIR}/bin +- install -m 0755 ifconfig ${BASEDIR}/bin ++ install -m 0755 ifconfig ${BASEDIR}/sbin + install -m 0755 nameif ${BASEDIR}/sbin + install -m 0755 netstat ${BASEDIR}/bin + install -m 0755 plipconfig $(BASEDIR)/sbin + install -m 0755 rarp ${BASEDIR}/sbin +- install -m 0755 route ${BASEDIR}/bin ++ install -m 0755 route ${BASEDIR}/sbin + install -m 0755 slattach $(BASEDIR)/sbin + ifeq ($(HAVE_IP_TOOLS),1) + install -m 0755 ipmaddr $(BASEDIR)/sbin diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index 605620a09..3bd848408 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $ +# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=net-tools -pkgver=1.60.20110819cvs -pkgrel=3 +pkgver=1.60.20120804git +pkgrel=2 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL2') -url="http://www.tazenda.demon.co.uk/phil/net-tools" +url="http://net-tools.sourceforge.net/" depends=('glibc') # http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 -# use cvs checkout instead -source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2 - net-tools-1.60-miiioctl.patch - net-tools-1.60-nameif_strncpy.patch) +# use git checkout instead +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz + Makefile.patch) options=(!makeflags) install=net-tools.install -sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' - '654a96bc6575efb4a2e04b49de45d448d240eb6e' - '7888000d8fe867e58b5b00fe2bcf6c3041d716b4') - +sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82' + '4191ca56dc01d6aebe26c36c7cc060c638d5ebca') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../net-tools-1.60-miiioctl.patch - patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/Makefile.patch yes "" | make } package() { - cd $srcdir/$pkgname-$pkgver - make BASEDIR=$pkgdir update + cd ${srcdir}/${pkgname}-${pkgver} + make BASEDIR=${pkgdir} update # the following is provided by yp-tools rm "${pkgdir}"/bin/{nis,yp}domainname |