View | Details | Raw Unified | Return to bug 58590
Collapse All | Expand All

(-)silc-server/Makefile (-16 / +14 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	silc
8
PORTNAME=	silc
9
PORTVERSION=	0.9.10.1
9
PORTVERSION=	0.9.14
10
CATEGORIES=	net ipv6 security
10
CATEGORIES=	net ipv6 security
11
MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
11
MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
12
		http://ftp.silcnet.org/%SUBDIR%/ \
12
		http://ftp.silcnet.org/%SUBDIR%/ \
Lines 28-43 Link Here
28
COMMENT=	Secure Internet Live Conferencing (SILC) network server
28
COMMENT=	Secure Internet Live Conferencing (SILC) network server
29
29
30
USE_BZIP2=	yes
30
USE_BZIP2=	yes
31
USE_LIBTOOL=	yes
31
USE_GMAKE=	yes
32
USE_REINPLACE=	yes
32
USE_REINPLACE=	yes
33
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
34
CONFIGURE_ARGS=	--with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
34
CONFIGURE_ARGS=	--with-silcd-config-file=${PREFIX}/etc/${PORTNAME}/silcd.conf \
35
		--with-etcdir=${PREFIX}/etc/${PORTNAME} \
35
		--with-etcdir=${PREFIX}/etc/${PORTNAME} \
36
		--with-helpdir=share/${PORTNAME}/help \
36
		--with-helpdir=share/${PORTNAME}/help \
37
		--with-logsdir=${PORTNAME}/logs \
37
		--with-logsdir=/var/log/${PORTNAME} \
38
		--with-simdir=${PREFIX}/lib/silcsim/server \
39
		--with-silcd-pid-file=/var/run/silcd.pid
38
		--with-silcd-pid-file=/var/run/silcd.pid
40
INSTALLS_SHLIB=	yes
39
41
PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
40
PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
42
PKGDEINSTALL=	${PKGINSTALL}
41
PKGDEINSTALL=	${PKGINSTALL}
43
42
Lines 47-53 Link Here
47
MAN8=	silcd.8
46
MAN8=	silcd.8
48
47
49
.ifndef(WITH_PTHREADS)
48
.ifndef(WITH_PTHREADS)
50
CONFIGURE_ARGS+=	--disable-threads
49
CONFIGURE_ARGS+=	--without-pthreads
51
.else
50
.else
52
CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
51
CONFIGURE_ENV+=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
53
.endif
52
.endif
Lines 60-74 Link Here
60
	@${ECHO_MSG} '===> Define WITH_PTHREADS to enable pthreads support'
59
	@${ECHO_MSG} '===> Define WITH_PTHREADS to enable pthreads support'
61
.endif
60
.endif
62
	@${ECHO_MSG}
61
	@${ECHO_MSG}
63
.ifndef(WITH_OPTIMIZED_CFLAGS)
62
64
	@${ECHO_MSG} '===> Define WITH_OPTIMIZED_CFLAGS to enable compilation optimizations'
63
post-extract:
65
	@${ECHO_MSG} '===> which is known to break some platforms (e.g., alpha)'
64
	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/silcd.sh \
66
.endif
65
	    > ${WRKSRC}/silcd.sh
67
66
68
post-patch:
67
post-patch:
69
.ifndef(WITH_OPTIMIZED_CFLAGS)
70
	@${REINPLACE_CMD} -e 's/-O2//' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
71
.endif
72
.ifdef(NOPORTDOCS)
68
.ifdef(NOPORTDOCS)
73
	@${REINPLACE_CMD} -E -e \
69
	@${REINPLACE_CMD} -E -e \
74
		's/(install-data-hook:.*)example-install/\1/' \
70
		's/(install-data-hook:.*)example-install/\1/' \
Lines 77-88 Link Here
77
	@${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \
73
	@${REINPLACE_CMD} -e 's/--libtool-enable-shared//' \
78
		${WRKSRC}/lib/silccrypt/Makefile.in
74
		${WRKSRC}/lib/silccrypt/Makefile.in
79
75
80
post-configure:
81
	@${CP} ${LIBTOOL} ${WRKSRC}
82
83
post-install:
76
post-install:
84
	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
77
	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
85
		${PKGINSTALL} ${PKGNAME} POST-INSTALL
78
		${PKGINSTALL} ${PKGNAME} POST-INSTALL
79
	${INSTALL_DATA} ${WRKSRC}/silcd.sh ${PREFIX}/etc/rc.d/silcd.sh-dist
80
	@if [ ! -f ${PREFIX}/etc/rc.d/silcd.sh ]; then \
81
		${ECHO} "Installing ${PREFIX}/etc/rc.d/silcd.sh startup file."; \
82
		${INSTALL_SCRIPT} ${WRKSRC}/silcd.sh ${PREFIX}/etc/rc.d/silcd.sh; \
83
	fi
86
84
87
.include <bsd.port.pre.mk>
85
.include <bsd.port.pre.mk>
88
86
(-)silc-server/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (silc-server-0.9.10.1.tar.bz2) = 47f687c8261f31befd16b8ae2fad2716
1
MD5 (silc-server-0.9.14.tar.bz2) = f10f423c6ccc2a8610439a517495cd58
(-)silc-server/files/patch-Makefile.in (-26 / +16 lines)
Lines 1-23 Link Here
1
--- Makefile.in.orig	Thu Dec  5 19:43:42 2002
1
--- Makefile.in.orig	Thu Oct 16 00:22:13 2003
2
+++ Makefile.in	Tue Dec 31 18:26:52 2002
2
+++ Makefile.in	Mon Oct 27 12:19:58 2003
3
@@ -231,7 +231,7 @@
3
@@ -702,8 +702,6 @@
4
 
4
 
5
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
6
 
7
-COMMONDIRS = lib irssi silc silcd doc includes
8
+COMMONDIRS = lib irssi silcd doc includes
9
 
10
 # Sub directories defined by "distributions" file, and can be overridden
11
 # with ./configure, which substitutes these variables.
12
@@ -700,7 +700,6 @@
13
 install-dirs:
5
 install-dirs:
14
 	-mkdir -p $(etcdir)
6
 	-mkdir -p $(etcdir)
15
 	-mkdir -p $(modulesdir)
7
-	-mkdir -p $(modulesdir)
16
-	-mkdir -p $(docdir)
8
-	-mkdir -p $(docdir)
17
 
9
 
18
 install-dirs-client: install-dirs
10
 install-dirs-client: install-dirs
19
 	-mkdir -p $(helpdir)
11
 	-mkdir -p $(helpdir)
20
@@ -728,8 +727,7 @@
12
@@ -731,8 +729,7 @@
21
 	 $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
13
 	 $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
22
 	fi
14
 	fi
23
 
15
 
Lines 27-33 Link Here
27
 	-@if test -f $(srcdir)/doc/silcd.8 ; then \
19
 	-@if test -f $(srcdir)/doc/silcd.8 ; then \
28
 	 $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
20
 	 $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
29
 	fi
21
 	fi
30
@@ -746,13 +744,11 @@
22
@@ -749,16 +746,13 @@
31
 	fi
23
 	fi
32
 
24
 
33
 etc-install-server:
25
 etc-install-server:
Lines 40-50 Link Here
40
-          chmod go= $(etcdir)/silcd.conf; \
32
-          chmod go= $(etcdir)/silcd.conf; \
41
-	fi
33
-	fi
42
+		$(etcdir)/silcalgs.conf.sample; \
34
+		$(etcdir)/silcalgs.conf.sample; \
43
+          chmod go= $(etcdir)/silcd.conf.sample
35
+          chmod go= $(etcdir)/silcd.conf.sample; \
44
 
36
 
45
 sim-install:
37
 sim-install:
46
 	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
38
-	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
47
@@ -764,9 +760,9 @@
39
 
40
 toolkit-install:
41
 	-mkdir -p $(docdir)/toolkit/
42
@@ -767,13 +761,13 @@
48
 	-cp -R $(srcdir)/tutorial $(prefix)
43
 	-cp -R $(srcdir)/tutorial $(prefix)
49
 
44
 
50
 examples-install:
45
 examples-install:
Lines 53-68 Link Here
53
-	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
48
-	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
54
+	-mkdir -p $(prefix)/share/examples/silc
49
+	-mkdir -p $(prefix)/share/examples/silc
55
+	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(prefix)/share/examples/silc
50
+	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(prefix)/share/examples/silc
56
+	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(prefix)/share/examples/silc
57
 
51
 
58
 generate-server-key:
52
 generate-server-key:
59
 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
53
 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
60
@@ -775,7 +771,7 @@
54
 	  $(sbindir)/silcd -C $(etcdir); \
55
+	    chmod 600 $(etcdir)/silcd.p*; \
56
 	fi
61
 
57
 
62
 @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
58
 @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
63
 @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key
64
-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
65
+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server
66
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
67
 # Otherwise a system limit (for SysV at least) may be exceeded.
68
 .NOEXPORT:
(-)silc-server/files/patch-doc:example_silcd.conf.in (+72 lines)
Line 0 Link Here
1
--- doc/example_silcd.conf.in.orig	Mon Oct 27 12:06:06 2003
2
+++ doc/example_silcd.conf.in	Mon Oct 27 12:07:47 2003
3
@@ -22,7 +22,6 @@
4
 # Include global algorithms from the "silcalgs.conf" file.  This file defines
5
 # ciphers, hash functions, HMACs and PKCS algorithms that can be used.
6
 #
7
-Include "@ETCDIR@/silcalgs.conf";
8
 
9
 #
10
 # General configuration options
11
@@ -32,11 +31,6 @@
12
 # for different connections.
13
 #
14
 General {
15
-	# This is the default path where to search modules.  If omitted
16
-	# built-in modules will be used.  Built-in modules will also be
17
-	# used if a module file cannot be located.
18
-	module_path = "@MODULESDIR@";
19
-
20
 	# If both passphrase and public key authentication is set for a
21
 	# connection the public key authentication is the preferred one
22
 	# to use.  Set this to `true' to prefer passphrase authentication
23
@@ -466,13 +460,13 @@
24
 # to true.  For normal connections set it false.  If it is set to true then
25
 # your server will be backup router.
26
 #
27
-ServerConnection {
28
-	Host = "10.2.1.7";
29
-	Passphrase = "verysecret";
30
-	#PublicKey = "/path/to/the/public.pub";
31
-	Params = "normal";
32
-	Backup = false;
33
-};
34
+#ServerConnection {
35
+#	Host = "10.2.1.7";
36
+#	Passphrase = "verysecret";
37
+#	#PublicKey = "/path/to/the/public.pub";
38
+#	Params = "normal";
39
+#	Backup = false;
40
+#};
41
 
42
 #
43
 # Configured router connections
44
@@ -502,17 +496,17 @@
45
 # backup router is in our cell then set the "BackupLocal" option to true.
46
 # If the backup router is in other cell then set it to false.
47
 #
48
-RouterConnection {
49
-	Host = "10.2.1.100";
50
-	Port = 706;
51
-	Passphrase = "verysecret";
52
-	#PublicKey = "/path/to/the/public.pub";
53
-	Params = "normal";
54
-	Initiator = true;
55
-	#BackupHost = "10.2.1.6";
56
-	#BackupPort = 706;
57
-	#BackupLocal = true;
58
-};
59
+#RouterConnection {
60
+#	Host = "10.2.1.100";
61
+#	Port = 706;
62
+#	Passphrase = "verysecret";
63
+#	#PublicKey = "/path/to/the/public.pub";
64
+#	Params = "normal";
65
+#	Initiator = true;
66
+#	#BackupHost = "10.2.1.6";
67
+#	#BackupPort = 706;
68
+#	#BackupLocal = true;
69
+#};
70
 
71
 #
72
 # Denied connections
(-)silc-server/files/patch-lib:Makefile.in (+18 lines)
Line 0 Link Here
1
--- lib/Makefile.in.orig	Mon Oct 27 11:28:00 2003
2
+++ lib/Makefile.in	Mon Oct 27 11:29:06 2003
3
@@ -541,15 +541,7 @@
4
 	-rm -rf libsilcclient.a
5
 
6
 @SILC_DIST_TOOLKIT_TRUE@install-exec-hook:
7
-@SILC_DIST_TOOLKIT_TRUE@	-mkdir -p $(DESTDIR)$(libdir)
8
-@SILC_DIST_TOOLKIT_TRUE@	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
9
-@SILC_DIST_TOOLKIT_TRUE@	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
10
 @SILC_DIST_TOOLKIT_FALSE@install-exec-hook:
11
-@SILC_DIST_TOOLKIT_FALSE@	-mkdir -p $(libdir)
12
-@SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
13
-@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
14
-@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
15
-@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
16
 
17
 # WIN32 DLL generation
18
 @SILC_DIST_WIN32DLL_TRUE@silc.dll: libsilc.a
(-)silc-server/files/patch-silcd:Makefile.in (-1 / +1 lines)
Lines 5-11 Link Here
5
 LDFLAGS = @LDFLAGS@
5
 LDFLAGS = @LDFLAGS@
6
 
6
 
7
-LIBS = $(SILC_COMMON_LIBS) -lsilc
7
-LIBS = $(SILC_COMMON_LIBS) -lsilc
8
+LIBS = -L$(top_srcdir)/lib/.libs $(SILC_COMMON_LIBS) -lsilc
8
+LIBS = -L$(top_srcdir)/lib $(SILC_COMMON_LIBS) -lsilc
9
 LIBSILCCLIENT_AGE = @LIBSILCCLIENT_AGE@
9
 LIBSILCCLIENT_AGE = @LIBSILCCLIENT_AGE@
10
 LIBSILCCLIENT_CURRENT = @LIBSILCCLIENT_CURRENT@
10
 LIBSILCCLIENT_CURRENT = @LIBSILCCLIENT_CURRENT@
11
 LIBSILCCLIENT_REVISION = @LIBSILCCLIENT_REVISION@
11
 LIBSILCCLIENT_REVISION = @LIBSILCCLIENT_REVISION@
(-)silc-server/files/silcd.sh (+15 lines)
Line 0 Link Here
1
#!/bin/sh
2
3
case "$1" in
4
start)
5
	[ -x %%PREFIX%%/sbin/silcd ] && %%PREFIX%%/sbin/silcd > /dev/null && echo -n ' silcd'
6
	;;
7
stop)
8
	[ -r /var/run/silcd.pid ] && /bin/kill `cat /var/run/silcd.pid` > /dev/null && echo -n ' silcd'
9
	;;
10
*)
11
	echo "Usage: `basename $0` {start|stop}" >&2
12
	;;
13
esac
14
15
exit 0
(-)silc-server/pkg-plist (-17 / +4 lines)
Lines 1-23 Link Here
1
etc/silc/silcalgs.conf.sample
1
etc/silc/silcalgs.conf.sample
2
etc/silc/silcd.conf.sample
2
etc/silc/silcd.conf.sample
3
lib/libsilc-1.0.so.1
4
lib/libsilc.la
5
lib/libsilc.so
6
lib/silcsim/server/aes.sim.so
7
lib/silcsim/server/blowfish.sim.so
8
lib/silcsim/server/cast.sim.so
9
lib/silcsim/server/md5.sim.so
10
lib/silcsim/server/none.sim.so
11
lib/silcsim/server/rc5.sim.so
12
lib/silcsim/server/rc6.sim.so
13
lib/silcsim/server/rsa.sim.so
14
lib/silcsim/server/sha1.sim.so
15
lib/silcsim/server/twofish.sim.so
16
sbin/silcd
3
sbin/silcd
4
@unexec if cmp -s %D/etc/rc.d/silcd.sh %D/etc/rc.d/silcd.sh-dist; then rm -f %D/etc/rc.d/silcd.sh; fi
5
etc/rc.d/silcd.sh-dist
6
@exec [ -f %B/silcd.sh ] || ( cp %B/%f %B/silcd.sh; chmod 755 %B/silcd.sh )
17
%%PORTDOCS%%share/examples/silc/README
7
%%PORTDOCS%%share/examples/silc/README
18
%%PORTDOCS%%share/examples/silc/silcd.prv
19
%%PORTDOCS%%share/examples/silc/silcd.pub
20
%%PORTDOCS%%@dirrm share/examples/silc
8
%%PORTDOCS%%@dirrm share/examples/silc
21
@dirrm lib/silcsim/server
22
@unexec rmdir %D/lib/silcsim 2>/dev/null || true
23
@unexec rmdir %D/etc/silc 2>/dev/null || true
9
@unexec rmdir %D/etc/silc 2>/dev/null || true
10
@unexec rmdir /var/log/silc 2>/dev/null || true

Return to bug 58590