From 07cb38c6e4bb3a0f2506065e6abb82f7ae247b6e Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sat, 22 Oct 2016 23:15:58 -0700 Subject: [PATCH 1/3] traceroute: fix conflict with inetutils-traceroute. --- srcpkgs/traceroute/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template index ccf61fa052..c11e9eaec6 100644 --- a/srcpkgs/traceroute/template +++ b/srcpkgs/traceroute/template @@ -1,7 +1,7 @@ # Template file for 'traceroute' pkgname=traceroute version=2.1.0 -revision=1 +revision=2 short_desc="Traces the route taken by packets over an IPv4/IPv6 network" maintainer="Juan RP " license="GPL-2" @@ -9,6 +9,11 @@ homepage="http://traceroute.sourceforge.net" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz" checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 +alternatives=" + traceroute:traceroute:/usr/bin/linux-traceroute + traceroute:traceroute.1:/usr/share/man/man1/linux-traceroute.1 +" + do_build() { if [ "$CROSS_BUILD" ]; then make LDFLAGS="-L${wrksrc}/libsupp $LDFLAGS" CFLAGS="$CFLAGS $CPPFLAGS" CROSS=${XBPS_CROSS_TRIPLET}- ${makejobs} @@ -17,9 +22,9 @@ do_build() { fi } do_install() { - vbin traceroute/traceroute - vman traceroute/traceroute.8 + vbin traceroute/traceroute linux-traceroute + vman traceroute/traceroute.8 linux-traceroute.8 - ln -s traceroute $DESTDIR/usr/bin/traceroute6 - ln -s traceroute.8 $DESTDIR/usr/share/man/man8/traceroute6.8 + ln -s linux-traceroute $DESTDIR/usr/bin/traceroute6 + ln -s linux-traceroute.8 $DESTDIR/usr/share/man/man8/traceroute6.8 } From f11d6a3488847f86369c393acfe95d271469f5e5 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sat, 22 Oct 2016 23:22:58 -0700 Subject: [PATCH 2/3] net-tools: fix manpage for xbps-alternatives. The symlink is ifconfig.1. It was pointing to net-tools-ifconfig.8 in man1, so it was broken. --- srcpkgs/net-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template index 21e02d784d..c945c18d44 100644 --- a/srcpkgs/net-tools/template +++ b/srcpkgs/net-tools/template @@ -1,7 +1,7 @@ # Template file for 'net-tools' pkgname=net-tools version=1.60.20150526git -revision=2 +revision=3 hostmakedepends="git" short_desc="Basic networking tools" maintainer="Juan RP " @@ -10,7 +10,7 @@ license="GPL-2" alternatives=" ifconfig:ifconfig:/usr/bin/${pkgname}-ifconfig - ifconfig:ifconfig.8:/usr/share/man/man1/${pkgname}-ifconfig.8" + ifconfig:/usr/share/man/man1/ifconfig.1:/usr/share/man/man8/${pkgname}-ifconfig.8" do_fetch() { git clone git://git.code.sf.net/p/net-tools/code ${pkgname}-${version} From 317200f83ea817f8b110b33be8d712a8fd7fb5ca Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sat, 22 Oct 2016 23:34:54 -0700 Subject: [PATCH 3/3] util-linux: add logger alternative group. Fixes the conflict with inetutils-syslog. --- srcpkgs/util-linux/template | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 86f7892aa4..a7a796acac 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,7 +1,7 @@ # Template file for 'util-linux' pkgname=util-linux version=2.28.2 -revision=2 +revision=3 short_desc="Miscellaneous linux utilities" maintainer="Juan RP " homepage="https://www.kernel.org/pub/linux/utils/util-linux/" @@ -25,6 +25,11 @@ provides="eject-${version}_1" # XXX musl needs this for switch_root(8). CFLAGS="-D_DIRENT_HAVE_D_TYPE" +alternatives=" + logger:logger:/usr/bin/${pkgname}-logger + logger:logger.1:/usr/share/man/man1/${pkgname}-logger.1 +" + pre_configure() { NOCONFIGURE=1 ./autogen.sh } @@ -49,6 +54,8 @@ do_install() { # Correct perms for newgrp, chfn, chsh, wall and write. chmod u+s $DESTDIR/usr/bin/{newgrp,chsh,chfn} + mv ${DESTDIR}/usr/bin/{logger,${pkgname}-logger} + mv ${DESTDIR}/usr/share/man/man1/{logger,${pkgname}-logger}.1 # pam login utils. vinstall $FILESDIR/login.pam 644 etc/pam.d login vinstall $FILESDIR/su.pam 644 etc/pam.d su