From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- net-misc/aiccu/Manifest | 1 + net-misc/aiccu/aiccu-2007.01.15-r4.ebuild | 58 ++++++++++++++++ .../aiccu/files/aiccu-2007.01.15-Makefile.patch | 79 ++++++++++++++++++++++ .../files/aiccu-2007.01.15-r2-init.gentoo.patch | 33 +++++++++ .../aiccu/files/aiccu-2007.01.15-setupscript.patch | 17 +++++ .../aiccu/files/aiccu-2007.01.15-systemd.patch | 52 ++++++++++++++ net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch | 29 ++++++++ net-misc/aiccu/metadata.xml | 8 +++ 8 files changed, 277 insertions(+) create mode 100644 net-misc/aiccu/Manifest create mode 100644 net-misc/aiccu/aiccu-2007.01.15-r4.ebuild create mode 100644 net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch create mode 100644 net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch create mode 100644 net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch create mode 100644 net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch create mode 100644 net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch create mode 100644 net-misc/aiccu/metadata.xml (limited to 'net-misc/aiccu') diff --git a/net-misc/aiccu/Manifest b/net-misc/aiccu/Manifest new file mode 100644 index 000000000000..d3919d5dc977 --- /dev/null +++ b/net-misc/aiccu/Manifest @@ -0,0 +1 @@ +DIST aiccu_20070115.tar.gz 70056 SHA256 2260f426c13471169ccff8cb4a3908dc5f79fda18ddb6a55363e7824e6c4c760 SHA512 15b2f0dab51843e58abbd8a0cc13139e492057ee348e368e1b65476bb2760119e88982cd03ffc6ec2cb563a1b7a061e1f66a98861eaad15972d486ac17b7bc78 WHIRLPOOL a5743e9c28ec3b9f6bc43f1b715553842a13872f18281239ed76d3b322e3a4c3c3e0f0c5d80b47694bbedaf831d1b3feed285af9f37174cac323b2c1814813d7 diff --git a/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild b/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild new file mode 100644 index 000000000000..339ace8e057f --- /dev/null +++ b/net-misc/aiccu/aiccu-2007.01.15-r4.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils linux-info systemd toolchain-funcs + +DESCRIPTION="AICCU Client to configure an IPv6 tunnel to SixXS" +HOMEPAGE="http://www.sixxs.net/tools/aiccu" +SRC_URI="http://www.sixxs.net/archive/sixxs/aiccu/unix/${PN}_${PV//\./}.tar.gz" + +LICENSE="SixXS" +SLOT="0" +KEYWORDS="amd64 arm hppa ppc sparc x86" +IUSE="systemd" + +RDEPEND=" + net-libs/gnutls + sys-apps/iproute2 + systemd? ( sys-apps/systemd ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S=${WORKDIR}/${PN} + +CONFIG_CHECK="~TUN" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-r2-init.gentoo.patch \ + "${FILESDIR}"/${P}-Makefile.patch \ + "${FILESDIR}"/${P}-setupscript.patch \ + "${FILESDIR}"/${P}-uclibc.patch \ + "${FILESDIR}"/${P}-systemd.patch +} + +src_compile() { + # Don't use main Makefile since it requires additional + # dependencies which are useless for us. + emake CC=$(tc-getCC) STRIP= -C unix-console \ + HAVE_SYSTEMD=$(usex systemd 1 0) +} + +src_install() { + dosbin unix-console/${PN} + + insopts -m 600 + insinto /etc + doins doc/${PN}.conf + newinitd doc/${PN}.init.gentoo ${PN} + + use systemd && systemd_dounit doc/${PN}.service + + dodoc doc/{HOWTO,README,changelog} +} diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch b/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch new file mode 100644 index 000000000000..c0eabbefd906 --- /dev/null +++ b/net-misc/aiccu/files/aiccu-2007.01.15-Makefile.patch @@ -0,0 +1,79 @@ +--- unix-console/Makefile.old 2010-06-28 21:56:32.287782600 +0200 ++++ unix-console/Makefile 2010-06-28 22:15:56.232637681 +0200 +@@ -25,14 +25,11 @@ CWARNS += -W -Wall -Wshadow -Wpointer-ar + # CWARNS += -Wpacked + + #CFLAGS += $(CWARNS) -D_GNU_SOURCE -D_DEBUG -g3 -O0 +-CFLAGS += $(CWARNS) -D_GNU_SOURCE ++CFLAGS ?= $(CWARNS) -O3 ++CFLAGS += -D_GNU_SOURCE + CC = @gcc + RM = rm +- +-# Add -O3 when nothing is specified yet +-ifeq ($(shell echo $(CFLAGS) | grep -c "\-O"),0) +-CFLAGS += -O3 +-endif ++STRIP = strip + + # This is a console client + CFLAGS += -D AICCU_CONSOLE +@@ -42,7 +39,7 @@ CFLAGS += -D AICCU_CONSOLE + # Currently defaultly builds only on Linux, but other platforms might easily also support it + ifeq ($(shell uname | grep -c "Linux"),1) + CFLAGS += -D AICCU_GNUTLS +-LDFLAGS += -lgnutls ++LIBS += -lgnutls + endif + + # Linux +@@ -50,7 +47,7 @@ ifeq ($(shell uname | grep -c "Linux"),1 + CFLAGS += -D_LINUX -D HAS_IFHEAD -D AICCU_TYPE="\"linux\"" + SRCS += ../common/aiccu_linux.c + OBJS += ../common/aiccu_linux.o +-LDFLAGS += -lpthread -lresolv ++LIBS += -lpthread -lresolv + endif + + # FreeBSD +@@ -118,7 +115,7 @@ ifeq ($(shell uname | grep -c "Darwin"), + CFLAGS += -D_DARWIN -D NEED_IFHEAD -D AICCU_TYPE="\"darwin\"" + SRCS += ../common/aiccu_darwin.c + OBJS += ../common/aiccu_darwin.o +-LDFLAGS += -lresolv ++LIBS += -lresolv + endif + + # SunOS / Solaris +@@ -126,7 +123,7 @@ ifeq ($(shell uname | grep -c "SunOS"),1 + CFLAGS += -D_SUNOS -D AICCU_TYPE="\"sunos\"" + SRCS += ../common/aiccu_sunos.c + OBJS += ../common/aiccu_sunos.o +-LDFLAGS += -lsocket -lnsl -lresolv ++LIBS += -lsocket -lnsl -lresolv + endif + + # AIX +@@ -137,17 +134,19 @@ CFLAGS += -D AICCU_CONSOLE + CFLAGS += -D_AIX -D AICCU_TYPE="\"aix\"" + SRCS += ../common/aiccu_aix.c + OBJS += ../common/aiccu_aix.o +-LDFLAGS += -lpthread ++LIBS += -lpthread + endif + + + all: aiccu + + aiccu: $(OBJS) ${SRCS} ${INCS} +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0) + ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1) +- strip $@ ++ifdef STRIP ++ $(STRIP) $@ ++endif + endif + endif + diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch b/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch new file mode 100644 index 000000000000..35ca2b8a6719 --- /dev/null +++ b/net-misc/aiccu/files/aiccu-2007.01.15-r2-init.gentoo.patch @@ -0,0 +1,33 @@ +--- aiccu/doc/aiccu.init.gentoo ++++ aiccu/doc/aiccu.init.gentoo +@@ -2,7 +2,7 @@ + + depend() { + need net +- after ntp-client ++ after ntp-client ntpd + } + + checkconfig() { +@@ -23,14 +23,19 @@ + start() { + checkconfig || return 1 + ebegin "Starting aiccu" +- start-stop-daemon --start --oknodo --quiet --exec /usr/sbin/aiccu -- start ++ start-stop-daemon --start --quiet --exec /usr/sbin/aiccu -- start + eend $? + } + + + stop() { + ebegin "Stopping aiccu" +- start-stop-daemon --stop --oknodo --quiet --exec /usr/sbin/aiccu -- stop ++ start-stop-daemon --stop --pidfile /var/run/aiccu.pid --quiet --exec /usr/sbin/aiccu -- stop + eend $? + } + ++restart() { ++ stop ++ sleep 3 ++ start ++} diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch b/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch new file mode 100644 index 000000000000..8981530435f3 --- /dev/null +++ b/net-misc/aiccu/files/aiccu-2007.01.15-setupscript.patch @@ -0,0 +1,17 @@ +--- aiccu/unix-console/main.c ++++ aiccu/unix-console/main.c +@@ -471,6 +471,14 @@ + */ + if (aiccu_setup(hTunnel, true)) + { ++ ++ /* Running setup script */ ++ if (g_aiccu->setupscript) ++ { ++ aiccu_exec("%s", g_aiccu->setupscript); ++ } ++ ++ + /* We need to stay running when doing Heartbeat or AYIYA */ + if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 || + strcasecmp(hTunnel->sType, "ayiya") == 0) diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch b/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch new file mode 100644 index 000000000000..e8616d04b3fc --- /dev/null +++ b/net-misc/aiccu/files/aiccu-2007.01.15-systemd.patch @@ -0,0 +1,52 @@ +--- /dev/null ++++ aiccu-2007.01.15/doc/aiccu.service +@@ -0,0 +1,13 @@ ++[Unit] ++Description=Automatic IPv6 Connectivity Client Utility ++After=time-sync.target network.target ++ConditionPathExists=/etc/aiccu.conf ++ ++ ++[Service] ++Type=notify ++ExecStart=/usr/sbin/aiccu start ++ExecStop=/usr/sbin/aiccu stop ++ ++[Install] ++WantedBy=multi-user.target +--- aiccu-2007.01.15/unix-console/Makefile ++++ aiccu-2007.01.15/unix-console/Makefile +@@ -48,6 +48,10 @@ ifeq ($(shell uname | grep -c "Linux"),1) + SRCS += ../common/aiccu_linux.c + OBJS += ../common/aiccu_linux.o + LIBS += -lpthread -lresolv ++ifeq (1,$(HAVE_SYSTEMD)) ++LIBS += $(shell pkg-config --libs libsystemd 2>/dev/null || pkg-config --libs libsystemd-daemon) ++CFLAGS += -DHAVE_SYSTEMD ++endif + endif + + # FreeBSD +--- aiccu-2007.01.15/unix-console/main.c ++++ aiccu-2007.01.15/unix-console/main.c +@@ -12,6 +12,9 @@ + + #include "../common/aiccu.h" + #include "../common/tun.h" ++#ifdef HAVE_SYSTEMD ++#include ++#endif + + #ifndef _WIN32 + /* Enable/Disable heartbeating */ +@@ -478,6 +481,10 @@ int main(int argc, char *argv[]) + aiccu_exec("%s", g_aiccu->setupscript); + } + ++#ifdef HAVE_SYSTEMD ++ /* Tell systemd we are operational. */ ++ sd_notify(0, "READY=1"); ++#endif + + /* We need to stay running when doing Heartbeat or AYIYA */ + if ( strcasecmp(hTunnel->sType, "6in4-heartbeat") == 0 || diff --git a/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch b/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch new file mode 100644 index 000000000000..56341dea72f4 --- /dev/null +++ b/net-misc/aiccu/files/aiccu-2007.01.15-uclibc.patch @@ -0,0 +1,29 @@ +--- aiccu/common/resolver.c ++++ aiccu/common/resolver.c +@@ -26,7 +26,7 @@ + + int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record)) + { +-#ifdef _LINUX ++#if defined(_LINUX) && ! defined(__UCLIBC__) + struct __res_state res; + #endif + unsigned char answer[8192]; +@@ -38,7 +38,7 @@ + uint16_t type = 0, class = 0; + uint32_t ttl = 0; + +-#ifdef _LINUX ++#if defined(_LINUX) && ! defined(__UCLIBC__) + memset(&res, 0, sizeof(res)); + res.options = RES_DEBUG; + res_ninit(&res); +@@ -47,7 +47,7 @@ + #endif + + memset(answer, 0, sizeof(answer)); +-#ifdef _LINUX ++#if defined(_LINUX) && ! defined(__UCLIBC__) + ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer)); + #else + ret = res_query(label, C_IN, rrtype, answer, sizeof(answer)); diff --git a/net-misc/aiccu/metadata.xml b/net-misc/aiccu/metadata.xml new file mode 100644 index 000000000000..5b80fb94c393 --- /dev/null +++ b/net-misc/aiccu/metadata.xml @@ -0,0 +1,8 @@ + + + + +xmw@gentoo.org +Michael Weber + + -- cgit v1.2.3-18-g5258