OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 04-Nov-2009 18:47:29
Branch: HEAD Handle: 2009110417472800
Modified files:
openpkg-src/vpnc vpnc.patch vpnc.spec
Log:
improve packaging and FreeBSD support
Summary:
Revision Changes Path
1.2 +52 -1 openpkg-src/vpnc/vpnc.patch
1.2 +4 -1 openpkg-src/vpnc/vpnc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vpnc/vpnc.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 vpnc.patch
--- openpkg-src/vpnc/vpnc.patch 3 Nov 2009 18:52:03 -0000 1.1
+++ openpkg-src/vpnc/vpnc.patch 4 Nov 2009 17:47:28 -0000 1.2
@@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2008-11-19 21:36:12 +0100
-+++ Makefile 2009-11-03 19:41:11 +0100
++++ Makefile 2009-11-04 18:44:22 +0100
@@ -21,11 +21,11 @@
DESTDIR=
@@ -31,3 +31,54 @@
ifeq ($(shell uname -s), SunOS)
LDFLAGS += -lnsl -lresolv -lsocket
+@@ -69,7 +68,7 @@
+ all : $(BINS) vpnc.8 vpnc-script
+
+ vpnc : $(OBJS) vpnc.o
+- $(CC) -o $@ $^ $(LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+ vpnc.8 : vpnc.8.template makeman.pl vpnc
+ ./makeman.pl
+@@ -78,7 +77,7 @@
+ sed -e 's,@''PREFIX''@,$(PREFIX),g' $< > $@ && chmod 755 $@
+
+ cisco-decrypt : cisco-decrypt.o decrypt-utils.o
+- $(CC) -o $@ $^ $(LDFLAGS)
++ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+
+ .depend: $(SRCS) $(BINSRCS)
+ $(CC) -MM $(SRCS) $(BINSRCS) $(CFLAGS) $(CPPFLAGS) > $@
+Index: sysdep.h
+--- sysdep.h.orig 2008-11-19 21:36:12 +0100
++++ sysdep.h 2009-11-04 18:44:22 +0100
+@@ -86,6 +86,10 @@
+ #define HAVE_FGETLN 1
+ #define HAVE_UNSETENV 1
+ #define HAVE_SETENV 1
++#include <sys/param.h>
++#if __FreeBSD_version >= 800067
++#define HAVE_GETLINE 1
++#endif
+ #endif
+
+
/***************************************************************************/
+Index: vpnc-script.in
+--- vpnc-script.in.orig 2008-11-19 21:55:51 +0100
++++ vpnc-script.in 2009-11-04 18:44:22 +0100
+@@ -420,11 +420,13 @@
+ fi
+ fi
+ elif [ "$OS" = "FreeBSD" ]; then
+- if [ ! -e /dev/tun ]; then
++ kldstat -q -m if_tun
++ if [ ${?} != 0 ]; then
+ kldload if_tun
+ fi
+ elif [ "$OS" = "GNU/kFreeBSD" ]; then
+- if [ ! -e /dev/tun ]; then
++ kldstat -q -m if_tun
++ if [ ${?} != 0 ]; then
+ kldload if_tun
+ fi
+ elif [ "$OS" = "NetBSD" ]; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vpnc/vpnc.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 vpnc.spec
--- openpkg-src/vpnc/vpnc.spec 3 Nov 2009 18:52:03 -0000 1.1
+++ openpkg-src/vpnc/vpnc.spec 4 Nov 2009 17:47:28 -0000 1.2
@@ -34,7 +34,7 @@
Group: Network
License: GPL
Version: 0.5.3
-Release: 20091103
+Release: 20091104
# package options
%option with_hybrid yes
@@ -86,6 +86,9 @@
%{l_shtool} subst \
-e 's;/etc/vpnc/vpnc-script;%{l_prefix}/etc/vpnc/vpnc-script;' \
-e 's;/var/run/vpnc/pid;%{l_prefix}/var/vpnc/vpnc.pid;' \
+ -e 's;/etc/vpnc/default.conf;%{l_prefix}/etc/vpnc/vpnc.conf;' \
+ -e 's;/etc/vpnc.conf;%{l_prefix}/etc/vpnc/vpnc.conf;' \
+ -e 's;"/etc/vpnc/";"%{l_prefix}/etc/vpnc/";' \
config.c
%{l_make} %{l_mflags} \
CC="%{l_cc}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
