Date: Thu, 10 Aug 2006 15:11:21 +0200 From: Matthew West <mwest@uct.ac.za> To: FreeBSD-gnats-submit@FreeBSD.org Cc: aquatique-ports@rambler.ru Subject: ports/101755: port update: net/silc-server from 0.9.18 to 1.0.2 Message-ID: <E1GBAJl-0000iR-Ax@casper2.cs.uct.ac.za> Resent-Message-ID: <200608101320.k7ADK6e7048948@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101755 >Category: ports >Synopsis: port update: net/silc-server from 0.9.18 to 1.0.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Aug 10 13:20:05 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Matthew West >Release: >Organization: University of Cape Town >Environment: >Description: This patch updates ports/net/silc-server from 0.9.18 to 1.0.2. Files added: files/patch-apps:silcd:Makefile.in files/patch-doc:Makefile.in files/patch-lib:silcsim:Makefile.in Files removed: files/patch-Makefile.in files/patch-lib:Makefile.in files/patch-silcd:Makefile.in >How-To-Repeat: >Fix: --- silc-server.diff begins here --- diff -ruN silc-server.orig/Makefile silc-server/Makefile --- silc-server.orig/Makefile Fri May 12 00:49:26 2006 +++ silc-server/Makefile Thu Aug 10 13:30:17 2006 @@ -6,7 +6,7 @@ # PORTNAME= silc -PORTVERSION= 0.9.18 +PORTVERSION= 1.0.2 CATEGORIES= net ipv6 security MASTER_SITES= http://www.silcnet.org/download/%SUBDIR%/ \ http://ftp.silcnet.org/%SUBDIR%/ \ diff -ruN silc-server.orig/distinfo silc-server/distinfo --- silc-server.orig/distinfo Sun Jan 22 23:23:49 2006 +++ silc-server/distinfo Tue Aug 8 17:40:57 2006 @@ -1,3 +1,3 @@ -MD5 (silc-server-0.9.18.tar.bz2) = c74b2ba088a81b670a64d350239cde62 -SHA256 (silc-server-0.9.18.tar.bz2) = d294a5d09be764bfd8feb79851eab69a83a11fe8ed9c8c1496e5d6e9c668915b -SIZE (silc-server-0.9.18.tar.bz2) = 1169331 +MD5 (silc-server-1.0.2.tar.bz2) = a55b86783cc6b502e80fcbe73e698329 +SHA256 (silc-server-1.0.2.tar.bz2) = 37812c18a7221fe4ff87ef31a28ba9de97a3b722d7507c14ed0552cee20559b3 +SIZE (silc-server-1.0.2.tar.bz2) = 890357 diff -ruN silc-server.orig/files/patch-apps:silcd:Makefile.in silc-server/files/patch-apps:silcd:Makefile.in --- silc-server.orig/files/patch-apps:silcd:Makefile.in Thu Jan 1 02:00:00 1970 +++ silc-server/files/patch-apps:silcd:Makefile.in Thu Aug 10 14:07:25 2006 @@ -0,0 +1,55 @@ +--- apps/silcd/Makefile.in.orig Wed Dec 14 15:47:35 2005 ++++ apps/silcd/Makefile.in Thu Aug 10 14:07:21 2006 +@@ -358,8 +358,8 @@ + || test -f $$p1 \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$p'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$p" || exit 1; \ + else :; fi; \ + done + +@@ -579,14 +579,11 @@ + + + install-dirs-server: +- -mkdir -p $(docdir) + -mkdir -p $(etcdir) +- -mkdir -p $(logsdir) + -mkdir -p $(mandir)/man5 + -mkdir -p $(mandir)/man8 + + doc-install-server: +- -$(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf $(docdir)/ + -@if test -f $(top_srcdir)/doc/silcd.8 ; then \ + $(INSTALL_DATA) $(top_srcdir)/doc/silcd.8 $(mandir)/man8; \ + fi +@@ -597,19 +594,21 @@ + etc-install-server: + -@if test '!' -f $(etcdir)/silcd.conf ; then \ + $(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf \ +- $(etcdir)/silcd.conf; \ ++ $(etcdir)/silcd.conf.sample; \ + $(INSTALL_DATA) $(top_srcdir)/doc/silcalgs.conf \ +- $(etcdir)/silcalgs.conf; \ +- chmod go= $(etcdir)/silcd.conf; \ ++ $(etcdir)/silcalgs.conf.sample; \ ++ chmod go= $(etcdir)/silcd.conf.sample; \ + fi + + examples-install: +- -mkdir -p $(docdir)/examples/ +- -$(INSTALL_DATA) $(top_srcdir)/doc/examples/* $(docdir)/examples/ ++ -mkdir -p $(prefix)/share/examples/silc ++ -$(INSTALL_DATA) $(top_srcdir)/doc/examples/README $(prefix)/share/examples/silc ++ -$(INSTALL_DATA) $(top_srcdir)/doc/examples/cell* $(prefix)/share/examples/silc + + generate-server-key: + -@if test '!' -f $(etcdir)/silcd.pub ; then \ + $(sbindir)/silcd -C $(etcdir); \ ++ chmod 600 $(etcdir)/silcd.p*; \ + fi + + install-data-hook: \ diff -ruN silc-server.orig/files/patch-doc:Makefile.in silc-server/files/patch-doc:Makefile.in --- silc-server.orig/files/patch-doc:Makefile.in Thu Jan 1 02:00:00 1970 +++ silc-server/files/patch-doc:Makefile.in Thu Aug 10 13:39:41 2006 @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig Wed Dec 14 15:47:35 2005 ++++ doc/Makefile.in Thu Aug 10 13:38:49 2006 +@@ -477,7 +477,7 @@ + -$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/ + -$(INSTALL_DATA) $(top_srcdir)/TODO $(docdir)/ + +-install-data-hook: doc-install ++install-data-hook: + + @INCLUDE_DEFINES_INT@ + diff -ruN silc-server.orig/files/patch-lib:Makefile.in silc-server/files/patch-lib:Makefile.in diff -ruN silc-server.orig/files/patch-lib:silcsim:Makefile.in silc-server/files/patch-lib:silcsim:Makefile.in --- silc-server.orig/files/patch-lib:silcsim:Makefile.in Thu Jan 1 02:00:00 1970 +++ silc-server/files/patch-lib:silcsim:Makefile.in Thu Aug 10 13:31:22 2006 @@ -0,0 +1,11 @@ +--- lib/silcsim/Makefile.in.orig Wed Dec 14 15:47:35 2005 ++++ lib/silcsim/Makefile.in Thu Aug 10 13:30:43 2006 +@@ -563,8 +563,6 @@ + # Installation + # + install-data-hook: +- -mkdir -p $(modulesdir) +- -$(INSTALL_DATA) $(top_srcdir)/lib/silcsim/*.so $(modulesdir)/ + + @INCLUDE_DEFINES_INT@ + diff -ruN silc-server.orig/pkg-install silc-server/pkg-install --- silc-server.orig/pkg-install Fri Nov 16 02:32:23 2001 +++ silc-server/pkg-install Thu Aug 10 14:54:59 2006 @@ -52,7 +52,7 @@ else ${SILC_DAEMON} -C ${CONF_DIR} fi - ${INSTALL_DIR} ${PKG_PREFIX}/silc/logs + ${INSTALL_DIR} /var/log/silc ;; DEINSTALL) @@ -72,7 +72,7 @@ done echo "$PKGNAME: Also, do not forget to 'rmdir ${CONF_DIR} 2>/dev/null'" - ${RMDIR} ${PKG_PREFIX}/silc/logs 2>/dev/null + ${RMDIR} /var/log/silc 2>/dev/null if [ -d ${PKG_PREFIX}/silc ] then ${RMDIR} ${PKG_PREFIX}/silc 2>/dev/null || echo "$PKGNAME: Will not remove silc server logs. If permanently removing the port, 'rm -Rf ${PKG_PREFIX}/silc'" diff -ruN silc-server.orig/pkg-plist silc-server/pkg-plist --- silc-server.orig/pkg-plist Sun Jan 22 04:46:06 2006 +++ silc-server/pkg-plist Thu Aug 10 14:49:48 2006 @@ -11,4 +11,3 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/cell_server2.conf %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrmtry etc/silc -@dirrmtry var/log/silc --- silc-server.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1GBAJl-0000iR-Ax>