From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- net-misc/olsrd/Manifest | 8 +++ net-misc/olsrd/files/olsrd | 26 ++++++++ net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch | 29 +++++++++ net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch | 21 ++++++ net-misc/olsrd/metadata.xml | 10 +++ net-misc/olsrd/olsrd-0.9.6.1.ebuild | 97 ++++++++++++++++++++++++++++ 6 files changed, 191 insertions(+) create mode 100644 net-misc/olsrd/Manifest create mode 100644 net-misc/olsrd/files/olsrd create mode 100644 net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch create mode 100644 net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch create mode 100644 net-misc/olsrd/metadata.xml create mode 100644 net-misc/olsrd/olsrd-0.9.6.1.ebuild (limited to 'net-misc/olsrd') diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest new file mode 100644 index 000000000000..799ab0335f88 --- /dev/null +++ b/net-misc/olsrd/Manifest @@ -0,0 +1,8 @@ +AUX olsrd 479 SHA256 6cf3645e95183e4352b65487bf99cbc53ec6c31334ad53b80d8d53ebd5d94e0e SHA512 8fab5fc2fda925a346d8f61f5be31bce666a2922c66bfb8c6a48a9943673b5be713cd5a93dd96b3d06d470793dc6136d624efb52ff1c58c8f5e6887336bffe38 WHIRLPOOL 38ac3b15bfa1803882378f9d1da3655685d6cd85a1b27576ab0b8aecd3ab14b14c8e907c5954313d8f9d04e58621f3a805284eb3f57f8433e3f56863aaea387a +AUX olsrd-0.9.0.2-gtk.patch 926 SHA256 199cc3f0aa5bb88ad5040d2c4b7a74afc22ba4dfbd98acc36d0e861346e6c553 SHA512 191bb1cb0da122a9b44a9297e78998f9b1ecc70948dd9ee216b5d4fb56b41072c53249b39a6c0584366c7518ee2d4b161833be2e5289d707693dd0d87f2e6791 WHIRLPOOL d3afefe493fa4b09fc97c34fc616cf1ef321ef7579b31455fdf854334ebb8f8d5b1c6d509bc1a134e126be7961d55b6a3c8136f42cdf2036578d57a3fd2a30f0 +AUX olsrd-0.9.6-gpsd.patch 537 SHA256 d34d4603094d0f7cfab0561a16f478bc21a2c393a815952627dd2788c80d18b0 SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88 WHIRLPOOL b5849224adc3ed5ffaa974cc3cb760c145028596a8eea2fc658a3167b4b19c026b60f32c0b2143ec72a79af6e1488f1ced0d2e8384f5507a7e54a3f08eab8c91 +DIST olsrd-0.9.6.1.tar.bz2 908871 SHA256 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a WHIRLPOOL 527cea2116dd390942fbada09946f8c4fcc5bb70977fb8073ecf1bda6eb95a14c37bff1e637d2031803cacce3dc3c7c0bb505273e0bbe1b847a60cbfb1d583f7 +EBUILD olsrd-0.9.6.1.ebuild 2237 SHA256 b2b13fc3e584e13b3af5ec257c385b3669007aee41d0922eff030a2e766827fa SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68 WHIRLPOOL 8aecc5ed392f63648fb6b96e74c0627f02796d11b3ef38abd94d85fe58738fafb3293989da98a4f9a195fa3d30f7fdd6189b2737154f177a615f8e9ffcc4a257 +MISC ChangeLog 2694 SHA256 3a19583699e6573e0e7723e6004dc66974fc5d344c46b3f536af86d7235cbf2b SHA512 1b7dd70a0a3ba31134931aa75db7c336a95594b11b9745040e1fb100a600072f1f4e79e98979b36489eb08e49db245826d51fd1569236fb210a0d18d4b6ca51f WHIRLPOOL 69e48a3a7997031eb74f94744d2bcb9fd07fc7678234994d4839963a873e5a63cda219533b66b99e1777c094ac727dfdacaef01e38782a20f6f74b38d5d93eb9 +MISC ChangeLog-2015 5678 SHA256 2ed75d3c016de0a3768c25859cdd7c89f014e926457c73dafdc437bbb5c4e536 SHA512 f03acb7c3fc716a2b940dc0c0fd62a9fb4d1e8420fdefa7e5b0fbbb9997f8f5ed64e539f88ecf9eeed37b4752ea01e47ce6780520403f906e2e3aeb95da870fa WHIRLPOOL 72e740d4c55cb8a86a5dd8c4846b845e5ff3016d9d823dfa458bbad6c2012b464439375fe2e0fa9099e1c9d92fc55ee97855c226dbb35bf2ca60c068a34b5692 +MISC metadata.xml 289 SHA256 66f2d1080adf1f3133cdff87f7689220928f0e04edd13c051050e30b82cba355 SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520 WHIRLPOOL a671fe64656aa127c583f4eb7c544d31f807bc27557a5425dedb64515ea6c57ca8fbb86c0d74b4b221b976760e3f7c9c832ccd526b6f46916eb1d43abcf6bf67 diff --git a/net-misc/olsrd/files/olsrd b/net-misc/olsrd/files/olsrd new file mode 100644 index 000000000000..aca79b9d428d --- /dev/null +++ b/net-misc/olsrd/files/olsrd @@ -0,0 +1,26 @@ +#!/sbin/openrc-run + +depend() { + need net +} + +checkconfig() { + if [ ! -e /etc/olsrd.conf ]; then + eerror "You need a /etc/olsrd.conf file to run olsrd" + eerror "There is sample file in /usr/share/doc/olsrd-version/" + return 1 + fi +} + +start() { + checkconfig || return 1 + ebegin "Starting olsrd" + start-stop-daemon --start --quiet --background --exec /usr/sbin/olsrd + eend $? +} + +stop() { + ebegin "Stopping olsrd" + start-stop-daemon --stop --quiet --exec /usr/sbin/olsrd + eend $? +} diff --git a/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch new file mode 100644 index 000000000000..0571340e4d03 --- /dev/null +++ b/net-misc/olsrd/files/olsrd-0.9.0.2-gtk.patch @@ -0,0 +1,29 @@ +--- a/gui/linux-gtk/Makefile ++++ b/gui/linux-gtk/Makefile +@@ -2,14 +2,14 @@ + include $(TOPDIR)/Makefile.inc + + # hardening flags: -fPIE -Wl,-z,now -pie +-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -fPIE -Wno-strict-prototypes \ ++CFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) -fPIE -Wno-strict-prototypes \ + -Wno-cast-qual +-CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0) ++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) + LDFLAGS += -pie + #LDFLAGS += -Wl,--warn-common + + +-LIBS := $(shell pkg-config --libs gtk+-2.0) -lm ++LIBS := $(shell $(PKG_CONFIG) --libs glib-2.0 gdk-pixbuf-2.0 gtk+-2.0) -lm + + # 32/64 cross compilation + ifdef M32 +@@ -30,7 +30,7 @@ + ifeq ($(VERBOSE),0) + @echo "[LD] $@" + endif +- $(MAKECMDPREFIX)$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(MAKECMDPREFIX)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + .PHONY: clean install + diff --git a/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch new file mode 100644 index 000000000000..a70115f1675c --- /dev/null +++ b/net-misc/olsrd/files/olsrd-0.9.6-gpsd.patch @@ -0,0 +1,21 @@ +--- a/lib/pud/src/gpsdclient.c ++++ b/lib/pud/src/gpsdclient.c +@@ -343,7 +343,6 @@ + | POLICY_SET // + #ifdef GPSD_JESSIE + | TIMEDRIFT_SET // +- | EOF_SET // + #endif + #ifdef GPSD_NEW + | TOFF_SET // +--- a/lib/pud/Makefile ++++ b/lib/pud/Makefile +@@ -108,7 +108,7 @@ + + default_target: nmealib library $(PLUGIN_FULLNAME) + +-$(PLUGIN_FULLNAME): $(OBJS) version-script.txt ++$(PLUGIN_FULLNAME): nmealib library $(OBJS) version-script.txt + ifeq ($(PUD_NMEALIB_STATICALLY_LINKED),) + ifeq ($(VERBOSE),0) + endif diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml new file mode 100644 index 000000000000..05b0733a9e78 --- /dev/null +++ b/net-misc/olsrd/metadata.xml @@ -0,0 +1,10 @@ + + + + + jer@gentoo.org + + +Install the Node Position Update plugin + + diff --git a/net-misc/olsrd/olsrd-0.9.6.1.ebuild b/net-misc/olsrd/olsrd-0.9.6.1.ebuild new file mode 100644 index 000000000000..1379675e09a0 --- /dev/null +++ b/net-misc/olsrd/olsrd-0.9.6.1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils multilib toolchain-funcs versionator + +DESCRIPTION="An implementation of the Optimized Link State Routing protocol" +HOMEPAGE="http://www.olsr.org/" +SRC_URI="http://www.olsr.org/releases/$(get_version_component_range 1-2)/${P}.tar.bz2" + +SLOT="0" +LICENSE="BSD LGPL-2.1" +KEYWORDS="amd64 x86" +IUSE="gtk pud" +DEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + ) + pud? ( sci-geosciences/gpsd ) +" +RDEPEND=" + ${DEPEND} +" +PATCHES=( + "${FILESDIR}"/${PN}-0.9.0.2-gtk.patch + "${FILESDIR}"/${PN}-0.9.6-gpsd.patch +) +src_prepare() { + default + + # fix parallel make + # respect AR + # verbose build + # fix default prefix, bug #453440 + sed -i \ + -e '/@echo "\[/d' \ + -e 's|$(MAKECMD)|$(MAKE)|g' \ + -e 's|@$(CC)|$(CC)|g' \ + -e 's|@ar |$(AR) |g' \ + -e '/^prefix/s:/usr/local:/usr:' \ + $( find . -name 'Makefile*' ) || die + + # respect LDFLAGS + sed -i \ + -e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \ + lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die +} + +src_configure() { + if ! use pud; then + sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die + fi +} + +src_compile() { + tc-export PKG_CONFIG + emake \ + CC="$(tc-getCC)" \ + VERBOSE=1 \ + LIBDIR="/usr/$(get_libdir)/${PN}" \ + OLSRD_LDFLAGS="${LDFLAGS}" \ + OS=linux \ + build_all + if use gtk; then + emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)" + fi +} + +src_install() { + emake OS=linux LIBDIR="${D}/usr/$(get_libdir)/${PN}" \ + DESTDIR="${D}" STRIP=true install_all + if use gtk; then + emake -C gui/linux-gtk \ + LIBDIR="${D}/usr/$(get_libdir)/${PN}" DESTDIR="${D}" install + fi + + doinitd "${FILESDIR}/${PN}" + + dodoc CHANGELOG \ + valgrind-howto.txt files/olsrd.conf.default.rfc \ + files/olsrd.conf.default.lq \ + lib/arprefresh/README_ARPREFRESH \ + lib/bmf/README_BMF \ + lib/dot_draw/README_DOT_DRAW \ + lib/dyn_gw/README_DYN_GW \ + lib/dyn_gw_plain/README_DYN_GW_PLAIN \ + lib/httpinfo/README_HTTPINFO \ + lib/mini/README_MINI \ + lib/nameservice/README_NAMESERVICE \ + lib/pgraph/README_PGRAPH \ + lib/quagga/README_QUAGGA \ + lib/secure/README_SECURE \ + lib/txtinfo/README_TXTINFO \ + lib/watchdog/README_WATCHDOG +} -- cgit v1.2.3