summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/iputils/PKGBUILD85
-rw-r--r--core/iputils/iputils.install11
-rw-r--r--core/iputils/tftp.xinetd10
-rw-r--r--core/libusbx/PKGBUILD9
-rw-r--r--core/openssh/PKGBUILD2
-rw-r--r--core/traceroute/PKGBUILD23
-rw-r--r--core/xz/PKGBUILD15
7 files changed, 97 insertions, 58 deletions
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index bf24c3a6e..daa70576c 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,67 +1,66 @@
-# $Id: PKGBUILD 142315 2011-11-08 10:57:52Z tpowa $
+# $Id: PKGBUILD 162361 2012-06-25 20:10:09Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=iputils
pkgver=20101006
-_traceroutever=1.4a12
-pkgrel=2.1
+pkgrel=3
pkgdesc="IP Configuration Utilities (and Ping)"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.linuxfoundation.org/en/Net:Iputils"
groups=('base')
-depends=('glibc' 'openssl' 'sysfsutils')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute')
-replaces=('netkit-base' 'traceroute')
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2
- ftp://ftp.ee.lbl.gov/traceroute-${_traceroutever}.tar.gz
- 'permission-fix.patch'
- 'iputils-s20101006-manpages.patch')
-options=('!makeflags')
-md5sums=('a36c25e9ec17e48be514dc0485e7376c'
- '964d599ef696efccdeebe7721cd4828d'
- '66109966cad06e425bb12a78bab85b70'
- 'd02dffac6f16e841921a9fc73bd2d3bd')
+depends=('openssl' 'sysfsutils' 'libcap')
+optdepends=('xinetd: for tftpd')
+makedepends=('docbook2x' 'opensp')
+conflicts=('netkit-base' 'arping' 'netkit-tftpd')
+replaces=('netkit-base')
+backup=(etc/xinetd.d/tftp)
+install=${pkgname}.install
+source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd)
+sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242'
+ 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd')
build() {
- #build iptuils
cd "${srcdir}/${pkgname}-s${pkgver}"
-
- # Doc fails to build (see FS#20251)
- # As a temporary workaround, we use these man pages from Fedora & LFS
- patch -Np1 -i ../iputils-s20101006-manpages.patch
- find . -name Makefile | xargs sed -ri 's/^(CCOPT=.*)$/\1 '"${CFLAGS}"'/'
+
+ # Use our CFLAGS
+ sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
+
make
- # build traceroute
- # this is combined in this package because it's awkward as a separate package
- cd "${srcdir}/traceroute-${_traceroutever}"
- patch -Np1 -i ../permission-fix.patch
- find . -name Makefile.in | xargs sed -ri 's/^(CCOPT=.*)$/\1 '"${CFLAGS}"'/'
- ./configure --prefix=/usr \
- --sbindir=/bin \
- --mandir=/usr/share/man
- make CFLAGS="${CFLAGS} -Ilinux-include/"
+ cd doc
+ for file in *.sgml; do
+ xf=${file/.sgml/.xml}
+ osx -xlower -xno-nl-in-tag $file > $xf || true
+ sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
+ docbook2man $xf
+ done
}
package() {
cd "${srcdir}/${pkgname}-s${pkgver}"
- for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do
- install -D -m755 $i "${pkgdir}/usr/sbin/$i"
- done
- for i in ping ping6 traceroute6; do
- install -D -m4755 $i "${pkgdir}/bin/$i"
- done
-
- install -dm755 "${pkgdir}/usr/share/man/man8"
- install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath,traceroute6}.8 \
- "${pkgdir}/usr/share/man/man8/"
- cd "${pkgdir}/usr/share/man/man8"
+ install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
+
+ install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
+ "${pkgdir}"/usr/sbin/
+
+ install -m755 ping{,6} "${pkgdir}"/usr/bin/
+ ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/
+
+ install -dm755 "${pkgdir}"/usr/share/man/man8
+ install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
+ "${pkgdir}"/usr/share/man/man8/
+
+ cd "${pkgdir}"/usr/share/man/man8
ln -sf ping.8.gz ping6.8.gz
ln -sf tracepath.8.gz tracepath6.8.gz
- cd "${srcdir}/traceroute-${_traceroutever}"
- make DESTDIR="${pkgdir}" install install-man
+ # FS#24768
+ install -dm755 "${pkgdir}"/etc/xinetd.d/
+ install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/iputils/iputils.install b/core/iputils/iputils.install
new file mode 100644
index 000000000..2481fb396
--- /dev/null
+++ b/core/iputils/iputils.install
@@ -0,0 +1,11 @@
+post_install() {
+ setcap cap_net_raw=ep usr/bin/ping
+ setcap cap_net_raw=ep usr/bin/ping6
+ echo " >> Traceroute is now provided by core/traceroute"
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/core/iputils/tftp.xinetd b/core/iputils/tftp.xinetd
new file mode 100644
index 000000000..26041a3f9
--- /dev/null
+++ b/core/iputils/tftp.xinetd
@@ -0,0 +1,10 @@
+service tftp
+{
+ socket_type = dgram
+ protocol = udp
+ wait = yes
+ user = nobody
+ server = /usr/sbin/tftpd
+ server_args = /var/tftpboot
+ disable = yes
+}
diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD
index 1fbe0bc00..71575c47c 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusbx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160804 2012-06-06 10:38:17Z tpowa $
+# $Id: PKGBUILD 162327 2012-06-25 07:06:06Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libusbx
-pkgver=1.0.11
-pkgrel=2
+pkgver=1.0.12
+pkgrel=1
depends=('glibc')
pkgdesc="Library that provides generic access to USB device"
arch=(i686 x86_64 mips64el)
@@ -13,8 +13,7 @@ options=(!libtool)
replaces=('libusb1' 'libusb')
provides=("libusb=$pkgver")
conflicts=("libusb")
-
-md5sums=('9aaab6aee72f65900cc731ecbffb4cf4')
+md5sums=('c41352ac755c7992edfcbb2ea4ad1349')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index ebc7ac10b..609916c0e 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162156 2012-06-22 12:56:57Z dreisner $
+# $Id: PKGBUILD 162326 2012-06-25 06:10:45Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
diff --git a/core/traceroute/PKGBUILD b/core/traceroute/PKGBUILD
new file mode 100644
index 000000000..cb8c6351e
--- /dev/null
+++ b/core/traceroute/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: PKGBUILD 162362 2012-06-25 20:10:12Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+
+pkgname=traceroute
+pkgver=2.0.18
+pkgrel=1
+pkgdesc="Tracks the route taken by packets over an IP network"
+arch=('i686' 'x86_64')
+url="http://traceroute.sourceforge.net/"
+license=('GPL2')
+depends=('glibc')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('6bdccfd12f93b89aea53728b3c365db5a4362b6d')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make prefix=/usr DESTDIR="${pkgdir}" install
+}
diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD
index b7cb6a04f..0c9e47585 100644
--- a/core/xz/PKGBUILD
+++ b/core/xz/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 154939 2012-03-31 12:48:19Z pierre $
+# $Id: PKGBUILD 162329 2012-06-25 09:10:55Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
# Contributor: François Charette <firmicus@gmx.net>
pkgname=xz
-pkgver=5.0.3
-pkgrel=2
+pkgver=5.0.4
+pkgrel=1
pkgdesc='Library and command line tools for XZ and LZMA compressed files'
arch=('i686' 'x86_64' 'mips64el')
url='http://tukaani.org/xz/'
@@ -12,15 +12,12 @@ license=('GPL' 'LGPL' 'custom')
depends=('sh')
options=('!libtool')
source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig"
- 'compile-fix.patch')
-md5sums=('fefe52f9ecd521de2a8ce38c21a27574'
- 'd0725667a6dae0853194dc691e900e26'
- 'b74e4f7793848cc5765c848ea30f971f')
+ "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('df3df690aef18384e1e031be7ec3a964'
+ '6e203465ee9b8f646d85cf84755e2b32')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 -i ${srcdir}/compile-fix.patch
./configure --prefix=/usr \
--disable-rpath \
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-03 11:10:17 +0000