commit: 02e51d880c1e7f07ae76cefffc0cb3a663d48fb1 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Fri Jun 12 20:19:19 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Jun 12 20:19:19 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=02e51d88
net-misc/dibbler: fix minor gnu-ism. Bug #551818. Package-Manager: portage-2.2.18 RepoMan-Options: --force Manifest-Sign-Key: 0xF52D4BBA net-misc/dibbler/Manifest | 8 +++ net-misc/dibbler/dibbler-1.0.0.ebuild | 53 ++++++++++++++ net-misc/dibbler/files/dibbler-1.0.0-gnu-ism.patch | 83 ++++++++++++++++++++++ net-misc/dibbler/files/dibbler-client | 20 ++++++ net-misc/dibbler/files/dibbler-client.service | 8 +++ net-misc/dibbler/files/dibbler-relay | 20 ++++++ net-misc/dibbler/files/dibbler-server | 20 ++++++ net-misc/dibbler/metadata.xml | 8 +++ 8 files changed, 220 insertions(+) diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest new file mode 100644 index 0000000..7d5b199 --- /dev/null +++ b/net-misc/dibbler/Manifest @@ -0,0 +1,8 @@ +AUX dibbler-1.0.0-gnu-ism.patch 2164 SHA256 6d4ba47361dcf0110485fd11caa3a5dc6569e7efec6a5fc5cc58e337a6ed727b SHA512 0638be70e2e1cd72db0bcc7419b7731b5a4d1b38e2b42b8d7e6bd04dc41189787664e86cc255d033d6a1a834d1e46f16bc8f924eea7cd02aed5a29697e32a9f6 WHIRLPOOL 1b3c6474d4a3cca0c1045b99c80e03f659363de7d0a12301e4965e58ca230222d6cd8bee4324e5a5541babbba4d4d0cb1e8d0922d6ec0da029d23a4e2643a756 +AUX dibbler-client 465 SHA256 c0df2b8ea3968f1cd9edeeb20db3e65007b99cf52fb63a881308e9bea7849f34 SHA512 dda74ff643153a2d1f9782baa00031512bdf530e0bb68f5ab5190aaee9057cc7a521be031a23efd646e819aaf61b0759081c4774636597bc8d956069e1feb83d WHIRLPOOL c2885a318c850e4c91db307d694a621ece72db06ad900d6a5b160577dd7870e7fb649d6f09af7cc845fa335554766c964d6f155728c881f4f6216a197a9b5b60 +AUX dibbler-client.service 134 SHA256 1f5d6ef13392cba1c9fa01bfecc39967974568cd2c10fcfbee2ee7e88c3b378b SHA512 419e40ac4110061e675cccd351b5a3e5f46e0c62d5169feb97eadee805d99b9caaae5f65fb9433808081d670db1cbb5ba6d9776e794f4cff624ec85906e28613 WHIRLPOOL b04cd675afed703acdddbe2494f47f15b381fb88a4ae6ebb2b932414dae71ba5a051e1a277f4b225e52834e19cdf5cb3a6fcd53091f777463298948f9f82c8ae +AUX dibbler-relay 458 SHA256 8776df7bd9a016e6f41f67e89a4ecc44720717f7a3ca0a528550bf3739339a2a SHA512 905f8b9ffa29e38203c1e70238929beca0a4beed355e0304cc75c9aa3f45eee0ad8c026330c95f43630ed2c446dc0d9989dba25b097dfa091d0291980037bbd6 WHIRLPOOL b60933592ace1ded58e5b65cdd6c5d6aab9e06d70c515e588c9eed0d7e543810332478ef14bd14043212d83c9e0cf771ff27eeba2acfa9cbd2bd3bfde039e270 +AUX dibbler-server 465 SHA256 dfa7249acf9240737e3150fe7243dbc5871507ad48973b5fe641172a6a3537ea SHA512 45d9b142cec2a905ffbdb22ff643e70bda1ab246dfc1afd2b9eb0b40d6c64b0b54b821a9aa1ac19eed892ddb2f3929f9c11d1e5b0d4d4b3ebec464c4ed21628d WHIRLPOOL d4e5db3fccbf62a65b8964805733a9b8d9cffcc0b6a37af0a415135c07d93335f66f26b641162c84abc8f8fa023f75bcd2185b1b46868376a87dc02a22f90333 +DIST dibbler-1.0.0.tar.gz 4372693 SHA256 51283702a1e56c1bfe56fb95469ec7b1fc56ecb8e9a2c6d296b81d43bec14048 SHA512 38eae78e5d5dab2484c6467eb91e7e8eed62067a1f375a9a0e0ed3639c1bd9db7230bc7a33ee41ffd785d031994c6bec4a6b2eb75bb5c0d4645c7e669f568434 WHIRLPOOL 80a9deb26802b0d26a108abffb09a9b3e81faf1e2fda1f25f5a71b855741ee967b82486e0f7e79f9d1560abd43dfe6934e2d69c486c6302f0154972041e98d46 +EBUILD dibbler-1.0.0.ebuild 1339 SHA256 52c701d50149ca14314e9807f23f00ef7fb87936a305b96a0e3d32135ade583d SHA512 0fc1a4b43c0603bda8a4aadd7b6c43138932a4bf8bcd50d31139ec0a4917f0e8209b45da372e3cd9ad4c11d3f229a4a0e4adf088a4ab7fbca83dc0bcaf3c1dcd WHIRLPOOL 7e1cf34074b6e2248108bfd28f7ddbe9031c00c8a53ad8db5469fd8b118d521e87b2845fd1a59c818e1fbe511c568b2b7366bf70cc708db5748fd837a5c2b04e +MISC metadata.xml 238 SHA256 325bc955f2a5e5f2ed4b013fb6ec3ab8308fa98e84ce1c503f6a78bf42f3234e SHA512 14453949e63d402e99c24dfede43ebcac8bf3fc5c731114141bed639d0e0b0e71ffce033ab268595c155dee0b58e04e1bbe4023554f7fd54031c2f90f607cde4 WHIRLPOOL c31742cff7c49498de00d096d5dbeb0177bccbdea3f5713baab174d9e1ec782b781f8eb7c87e0e52aa4968c2f2601d1a914dfb6e5e2e59b9a1ca1615a0a9d172 diff --git a/net-misc/dibbler/dibbler-1.0.0.ebuild b/net-misc/dibbler/dibbler-1.0.0.ebuild new file mode 100644 index 0000000..24d47e5 --- /dev/null +++ b/net-misc/dibbler/dibbler-1.0.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/dibbler-1.0.0.ebuild,v 1.4 2015/02/10 10:10:12 ago Exp $ + +EAPI="5" +inherit eutils readme.gentoo systemd + +DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" +HOMEPAGE="http://klub.com.pl/dhcpv6/"; +SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~mips ~ppc x86" +IUSE="doc" + +DEPEND="doc? ( || ( + dev-texlive/texlive-latexextra + dev-tex/floatflt ) + )" +RDEPEND="" + +DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf +to suit your needs. They are stored in /etc/dibbler" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gnu-ism.patch + epatch_user +} + +src_compile() { + emake + # devel documentation is broken and users should consult the online version + # http://klub.com.pl/dhcpv6/doxygen/ + use doc && emake -C doc/ user +} + +src_install() { + readme.gentoo_create_doc + + dosbin dibbler-{client,relay,server} + doman doc/man/*.8 + + insinto /etc/dibbler + doins doc/examples/*.conf + dodir /var/lib/dibbler + + dodoc AUTHORS CHANGELOG RELNOTES TODO + use doc && dodoc doc/dibbler-user.pdf + + doinitd "${FILESDIR}"/dibbler-{client,relay,server} + systemd_dounit "${FILESDIR}"/dibbler-client.service +} diff --git a/net-misc/dibbler/files/dibbler-1.0.0-gnu-ism.patch b/net-misc/dibbler/files/dibbler-1.0.0-gnu-ism.patch new file mode 100644 index 0000000..aedc3e8 --- /dev/null +++ b/net-misc/dibbler/files/dibbler-1.0.0-gnu-ism.patch @@ -0,0 +1,83 @@ +From f8352ac6dfc61a99b1162e0fd28d30b1e9340fde Mon Sep 17 00:00:00 2001 +From: Robert Gerus <arachn...@i.am-a.cat> +Date: Thu, 11 Jun 2015 21:34:39 +0200 +Subject: [PATCH] Compatybility patch for musl + +Minor header/include/typedef changes to fix compatybility with musl libc. +Doesn't break compatybility with glibc, as far as I can tell. +--- + Misc/Portable.h.in | 4 ++++ + Port-linux/ethtool-local.h | 6 +++--- + Port-linux/lowlevel-linux-link-state.c | 4 +++- + Port-linux/utils.h | 5 +++++ + 4 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/Misc/Portable.h.in b/Misc/Portable.h.in +index 1a96293..2d94d0d 100644 +--- a/Misc/Portable.h.in ++++ b/Misc/Portable.h.in +@@ -29,6 +29,10 @@ + #include <arpa/inet.h> + #endif + ++#if defined(LINUX) ++# include <sys/select.h> ++#endif ++ + #include <stdint.h> + #include <unistd.h> + +diff --git a/Port-linux/ethtool-local.h b/Port-linux/ethtool-local.h +index 2940090..555f06b 100644 +--- a/Port-linux/ethtool-local.h ++++ b/Port-linux/ethtool-local.h +@@ -22,9 +22,9 @@ + */ + + typedef unsigned long long u64; +-typedef __uint32_t u32; +-typedef __uint16_t u16; +-typedef __uint8_t u8; ++typedef uint32_t u32; ++typedef uint16_t u16; ++typedef uint8_t u8; + + #include "ethtool-kernel.h" + +diff --git a/Port-linux/lowlevel-linux-link-state.c b/Port-linux/lowlevel-linux-link-state.c +index 7ca9f6b..76293ea 100644 +--- a/Port-linux/lowlevel-linux-link-state.c ++++ b/Port-linux/lowlevel-linux-link-state.c +@@ -18,7 +18,9 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> +-#include <bits/sigthread.h> ++#if defined(__GLIBC__) ++# include <bits/sigthread.h> ++#endif + #include "Portable.h" + #include "interface.h" + +diff --git a/Port-linux/utils.h b/Port-linux/utils.h +index e40d95f..579dffb 100644 +--- a/Port-linux/utils.h ++++ b/Port-linux/utils.h +@@ -1,9 +1,14 @@ + #ifndef __UTILS_H__ + #define __UTILS_H__ 1 + ++#ifndef _GNU_SOURCE ++# define _GNU_SOURCE 1 ++#endif ++ + #include <asm/types.h> + //#include <resolv.h> + #include <linux/types.h> ++#include <sys/types.h> + + #include "libnetlink.h" + #include "ll_map.h" +-- +2.4.3 + diff --git a/net-misc/dibbler/files/dibbler-client b/net-misc/dibbler/files/dibbler-client new file mode 100644 index 0000000..a1cf5b5 --- /dev/null +++ b/net-misc/dibbler/files/dibbler-client @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/files/dibbler-client,v 1.1 2005/09/20 07:53:59 gmsoft Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting DHCPv6 client: dibbler-client" + /usr/sbin/dibbler-client start + eend $? +} + +stop() { + ebegin "Stopping DHCPv6 client: dibbler-client" + /usr/sbin/dibbler-client stop + eend $? +} diff --git a/net-misc/dibbler/files/dibbler-client.service b/net-misc/dibbler/files/dibbler-client.service new file mode 100644 index 0000000..bdac263 --- /dev/null +++ b/net-misc/dibbler/files/dibbler-client.service @@ -0,0 +1,8 @@ +[Unit] +Description=Dibbler IPv6 DHCPv6 Client + +[Service] +ExecStart=/usr/sbin/dibbler-client run + +[Install] +WantedBy=multi-user.target diff --git a/net-misc/dibbler/files/dibbler-relay b/net-misc/dibbler/files/dibbler-relay new file mode 100644 index 0000000..13c4e16 --- /dev/null +++ b/net-misc/dibbler/files/dibbler-relay @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/files/dibbler-relay,v 1.1 2005/09/20 07:53:59 gmsoft Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting DHCPv6 relay: dibbler-relay" + /usr/sbin/dibbler-relay start + eend $? +} + +stop() { + ebegin "Stopping DHCPv6 relay: dibbler-relay" + /usr/sbin/dibbler-relay stop + eend $? +} diff --git a/net-misc/dibbler/files/dibbler-server b/net-misc/dibbler/files/dibbler-server new file mode 100644 index 0000000..e5a042d --- /dev/null +++ b/net-misc/dibbler/files/dibbler-server @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dibbler/files/dibbler-server,v 1.1 2005/09/20 07:53:59 gmsoft Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting DHCPv6 server: dibbler-server" + /usr/sbin/dibbler-server start + eend $? +} + +stop() { + ebegin "Stopping DHCPv6 server: dibbler-server" + /usr/sbin/dibbler-server stop + eend $? +} diff --git a/net-misc/dibbler/metadata.xml b/net-misc/dibbler/metadata.xml new file mode 100644 index 0000000..ea02039 --- /dev/null +++ b/net-misc/dibbler/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer> + <email>voyag...@gentoo.org</email> + <name>Bernard Cafarelli</name> + </maintainer> +</pkgmetadata>
