From owner-svn-ports-all@freebsd.org Wed Oct 2 11:08:28 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B693712B869; Wed, 2 Oct 2019 11:08:28 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46jtfh4TJQz4GTg; Wed, 2 Oct 2019 11:08:28 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 79D872A8C0; Wed, 2 Oct 2019 11:08:28 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x92B8Si5065662; Wed, 2 Oct 2019 11:08:28 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x92B8Qek065654; Wed, 2 Oct 2019 11:08:26 GMT (envelope-from decke@FreeBSD.org) Message-Id: <201910021108.x92B8Qek065654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Wed, 2 Oct 2019 11:08:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r513569 - in branches/2019Q4/net/olsrd: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in branches/2019Q4/net/olsrd: . files X-SVN-Commit-Revision: 513569 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2019 11:08:28 -0000 Author: decke Date: Wed Oct 2 11:08:26 2019 New Revision: 513569 URL: https://svnweb.freebsd.org/changeset/ports/513569 Log: MFH: r513489 net/olsrd: - Update to 0.9.8 - Switch to fetch from GitHub because they don't provide tarballs anymore - Fix portlint warnings - Fix some GNUisms (cp -t) - Fix compile error when RTF_CLONING is not defined PR: 240563 Submitted by: myself Approved by: ports-secteam (joneum) Added: branches/2019Q4/net/olsrd/files/patch-lib_dot__draw_Makefile - copied unchanged from r513489, head/net/olsrd/files/patch-lib_dot__draw_Makefile branches/2019Q4/net/olsrd/files/patch-src_bsd_kernel__routes.c - copied unchanged from r513489, head/net/olsrd/files/patch-src_bsd_kernel__routes.c Modified: branches/2019Q4/net/olsrd/Makefile branches/2019Q4/net/olsrd/distinfo branches/2019Q4/net/olsrd/files/patch-Makefile branches/2019Q4/net/olsrd/files/patch-lib-httpinfo-Makefile branches/2019Q4/net/olsrd/files/patch-make-Makefile.fbsd branches/2019Q4/net/olsrd/files/patch-src_bsd_net.c Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/net/olsrd/Makefile ============================================================================== --- branches/2019Q4/net/olsrd/Makefile Wed Oct 2 10:47:10 2019 (r513568) +++ branches/2019Q4/net/olsrd/Makefile Wed Oct 2 11:08:26 2019 (r513569) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= olsrd -DISTVERSION= 0.9.6.1 +DISTVERSIONPREFIX= v +DISTVERSION= 0.9.8 CATEGORIES= net -MASTER_SITES= http://www.olsr.org/releases/0.9/ MAINTAINER= koue@chaosophia.net COMMENT= OLSR routing daemon @@ -12,11 +12,14 @@ COMMENT= OLSR routing daemon LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -MAKE_ARGS= VERBOSE=1 -USES= bison gmake tar:bzip2 +USES= bison gmake +USE_GITHUB= yes USE_LDCONFIG= yes USE_RC_SUBR= olsrd +GH_ACCOUNT= OLSR +MAKE_ARGS= VERBOSE=1 + ALL_TARGET= build_all INSTALL_TARGET= install_all @@ -27,7 +30,6 @@ MULTI_IF_LIB_DEPENDS= libnet.so:net/libnet MULTI_IF_MAKE_ARGS= LIBNET=1 post-patch: - @${REINPLACE_CMD} -e 's|/sbin/ldconfig|:|g' ${WRKSRC}/make/Makefile.fbsd @${CP} ${WRKSRC}/src/cfgparser/cfgfile_gen.c \ ${WRKSRC}/src/cfgparser/olsrd_conf.h \ ${WRKSRC}/lib/httpinfo/src/ Modified: branches/2019Q4/net/olsrd/distinfo ============================================================================== --- branches/2019Q4/net/olsrd/distinfo Wed Oct 2 10:47:10 2019 (r513568) +++ branches/2019Q4/net/olsrd/distinfo Wed Oct 2 11:08:26 2019 (r513569) @@ -1,3 +1,3 @@ -TIMESTAMP = 1509820621 -SHA256 (olsrd-0.9.6.1.tar.bz2) = 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612 -SIZE (olsrd-0.9.6.1.tar.bz2) = 908871 +TIMESTAMP = 1566815063 +SHA256 (OLSR-olsrd-v0.9.8_GH0.tar.gz) = ee9e524224e5d5304dcf61f1dc5485c569da09d382934ff85b233be3e24821a3 +SIZE (OLSR-olsrd-v0.9.8_GH0.tar.gz) = 14416300 Modified: branches/2019Q4/net/olsrd/files/patch-Makefile ============================================================================== --- branches/2019Q4/net/olsrd/files/patch-Makefile Wed Oct 2 10:47:10 2019 (r513568) +++ branches/2019Q4/net/olsrd/files/patch-Makefile Wed Oct 2 11:08:26 2019 (r513569) @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-11-22 19:39:42 UTC +--- Makefile.orig 2019-08-11 08:09:47 UTC +++ Makefile @@ -167,20 +167,17 @@ uninstall_bin: install_olsrd: install_bin @@ -30,3 +30,16 @@ @echo ------------------------------------------- @echo Edit $(CFGFILE) before running olsrd!! @echo ------------------------------------------- +@@ -196,9 +193,10 @@ ifneq ($(RCDIR),) + endif + ifneq ($(DOCDIR_OLSRD),) + mkdir -p "$(DOCDIR_OLSRD)" +- cp -t "$(DOCDIR_OLSRD)" "CHANGELOG" "README-Olsr-Extensions" \ ++ cp "CHANGELOG" "README-Olsr-Extensions" \ + "README-LINUX_NL80211.txt" "files/olsrd.conf.default" \ +- "files/olsrd.conf.default.txt" "license.txt" ++ "files/olsrd.conf.default.txt" "license.txt" \ ++ "$(DOCDIR_OLSRD)" + endif + + uninstall_olsrd: uninstall_bin Modified: branches/2019Q4/net/olsrd/files/patch-lib-httpinfo-Makefile ============================================================================== --- branches/2019Q4/net/olsrd/files/patch-lib-httpinfo-Makefile Wed Oct 2 10:47:10 2019 (r513568) +++ branches/2019Q4/net/olsrd/files/patch-lib-httpinfo-Makefile Wed Oct 2 11:08:26 2019 (r513569) @@ -1,8 +1,8 @@ ---- lib/httpinfo/Makefile.orig 2016-11-22 19:39:42 UTC +--- lib/httpinfo/Makefile.orig 2019-08-11 08:09:47 UTC +++ lib/httpinfo/Makefile -@@ -52,7 +52,6 @@ ifdef ADMIN_INTERFACE - CPPFLAGS += -DADMIN_INTERFACE - endif +@@ -54,7 +54,6 @@ endif + + LDFLAGS += -lm -OBJS += $(TOPDIR)/src/cfgparser/cfgfile_gen.o Copied: branches/2019Q4/net/olsrd/files/patch-lib_dot__draw_Makefile (from r513489, head/net/olsrd/files/patch-lib_dot__draw_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/net/olsrd/files/patch-lib_dot__draw_Makefile Wed Oct 2 11:08:26 2019 (r513569, copy of r513489, head/net/olsrd/files/patch-lib_dot__draw_Makefile) @@ -0,0 +1,11 @@ +--- lib/dot_draw/Makefile.orig 2019-08-11 08:09:47 UTC ++++ lib/dot_draw/Makefile +@@ -63,7 +63,7 @@ install: $(PLUGIN_FULLNAME) + $(INSTALL_LIB) + ifneq ($(DOCDIR_OLSRD),) + mkdir -p "$(DOCDIR_OLSRD)" +- cp -t "$(DOCDIR_OLSRD)" "README_DOT_DRAW" "olsr-topology-view.pl" ++ cp "README_DOT_DRAW" "olsr-topology-view.pl" "$(DOCDIR_OLSRD)" + endif + + uninstall: Modified: branches/2019Q4/net/olsrd/files/patch-make-Makefile.fbsd ============================================================================== --- branches/2019Q4/net/olsrd/files/patch-make-Makefile.fbsd Wed Oct 2 10:47:10 2019 (r513568) +++ branches/2019Q4/net/olsrd/files/patch-make-Makefile.fbsd Wed Oct 2 11:08:26 2019 (r513569) @@ -1,9 +1,9 @@ ---- make/Makefile.fbsd.orig 2016-11-22 19:39:42 UTC +--- make/Makefile.fbsd.orig 2019-08-11 08:09:47 UTC +++ make/Makefile.fbsd -@@ -45,44 +45,49 @@ - # FREEBSD SPECIFIC CONFIGURATION - # +@@ -47,44 +47,47 @@ + LDCONFIG ?= /sbin/ldconfig + -PREFIX ?= /usr/local -SBINDIR = $(PREFIX)/sbin -ETCDIR = $(PREFIX)/etc/olsrd @@ -18,8 +18,8 @@ +mandir ?= $(prefix)/man +sbindir ?= $(prefix)/sbin --SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c) --HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h) +-SRCS += $(sort $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)) +-HDRS += $(sort $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)) +# the rest are defined in Makefile.inc, but we don't need to override defaults +ETCDIR = $(DESTDIR)$(etcdir) +LIBDIR = $(DESTDIR)$(libdir) @@ -49,10 +49,8 @@ +PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so +PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) -+INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -+ /sbin/ldconfig -m $(LIBDIR) -+UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \ -+ /sbin/ldconfig -m $(LIBDIR) ++INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME) ++UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME) + ifdef OLSRD_PLUGIN CFLAGS += -fPIC @@ -62,9 +60,9 @@ -PLUGIN_SONAME ?= $(PLUGIN_NAME) -PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) -INSTALL_LIB = install -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig +- $(LDCONFIG) -UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig +- $(LDCONFIG) - -OS_LIB_PTHREAD = -pthread +OS_LIB_PTHREAD = -lpthread Copied: branches/2019Q4/net/olsrd/files/patch-src_bsd_kernel__routes.c (from r513489, head/net/olsrd/files/patch-src_bsd_kernel__routes.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/net/olsrd/files/patch-src_bsd_kernel__routes.c Wed Oct 2 11:08:26 2019 (r513569, copy of r513489, head/net/olsrd/files/patch-src_bsd_kernel__routes.c) @@ -0,0 +1,12 @@ +--- src/bsd/kernel_routes.c.orig 2019-08-11 08:09:47 UTC ++++ src/bsd/kernel_routes.c +@@ -351,7 +351,9 @@ add_del_route6(const struct rt_entry *rt, int add) + memcpy(walker, &sdl, sizeof(sdl)); + walker += sdl_size; + rtm->rtm_addrs |= RTA_GATEWAY; ++#ifdef RTF_CLONING + rtm->rtm_flags |= RTF_CLONING; ++#endif /* RTF_CLONING */ + rtm->rtm_flags &= ~RTF_GATEWAY; + } + Modified: branches/2019Q4/net/olsrd/files/patch-src_bsd_net.c ============================================================================== --- branches/2019Q4/net/olsrd/files/patch-src_bsd_net.c Wed Oct 2 10:47:10 2019 (r513568) +++ branches/2019Q4/net/olsrd/files/patch-src_bsd_net.c Wed Oct 2 11:08:26 2019 (r513569) @@ -1,6 +1,6 @@ ---- src/bsd/net.c.orig 2016-06-22 12:04:33 UTC +--- src/bsd/net.c.orig 2019-08-11 08:09:47 UTC +++ src/bsd/net.c -@@ -125,6 +125,8 @@ +@@ -124,6 +124,8 @@ #include