[CVS] OpenPKG: openpkg-src/ss5/ ss5.patch ss5.spec
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: 07-Jul-2009 23:00:20 Branch: HEAD Handle: 2009070722002000 Modified files: openpkg-src/ss5 ss5.patch ss5.spec Log: upgrading package: ss5 3.7.8.7 -> 3.7.8.8 Summary: RevisionChanges Path 1.3 +6 -6 openpkg-src/ss5/ss5.patch 1.9 +3 -3 openpkg-src/ss5/ss5.spec patch -p0 <<'@@ .' Index: openpkg-src/ss5/ss5.patch $ cvs diff -u -r1.2 -r1.3 ss5.patch --- openpkg-src/ss5/ss5.patch 3 Jul 2009 17:48:35 - 1.2 +++ openpkg-src/ss5/ss5.patch 7 Jul 2009 21:00:20 - 1.3 @@ -1,6 +1,6 @@ Index: Makefile.in --- Makefile.in.orig 2009-03-24 21:28:22 +0100 -+++ Makefile.in 2009-07-03 19:43:16 +0200 Makefile.in 2009-07-07 22:38:17 +0200 @@ -42,32 +42,6 @@ @( cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) @( cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) @@ -52,7 +52,7 @@ @( if [ -f $(dst_dir)$(bin_path_base)/ss5 ]; then rm -f $(dst_dir)$(bin_path_base)/ss5; fi ) Index: build/mod_top.mk --- build/mod_top.mk.orig2009-03-24 21:28:22 +0100 -+++ build/mod_top.mk 2009-07-03 19:43:16 +0200 build/mod_top.mk 2009-07-07 22:38:17 +0200 @@ -24,8 +24,8 @@ top_srcd...@top_srcdir@ top_buildd...@top_builddir@ @@ -65,12 +65,12 @@ CC = @CC@ Index: configure configure.orig 2009-06-22 03:23:18 +0200 -+++ configure2009-07-03 19:44:58 +0200 +--- configure.orig 2009-06-22 07:29:26 +0200 configure2009-07-07 22:52:51 +0200 @@ -6399,15 +6399,15 @@ # Checks for OS if test "$OS" = "Linux"; then -CFLAGS="$CFLAGS -DLINUX" +CFLAGS="$CFLAGS -DLINUX -D_FILE_OFFSET_BITS=64" - LIBS="-rdynamic -ldl -lssl -lldap -lpam -lpam_misc" + LIBS="$LIBS -rdynamic -ldl -lssl -lldap -lpam -lpam_misc" fi; @@ -90,7 +90,7 @@ Index: src/Makefile.in --- src/Makefile.in.orig 2009-03-24 21:28:23 +0100 -+++ src/Makefile.in 2009-07-03 19:43:16 +0200 src/Makefile.in 2009-07-07 22:38:17 +0200 @@ -18,10 +18,10 @@ SRVOBJ = SS5Srv.o @@ . patch -p0 <<'@@ .' Index: openpkg-src/ss5/ss5.spec $ cvs diff -u -r1.8 -r1.9 ss5.spec --- openpkg-src/ss5/ss5.spec 3 Jul 2009 17:48:35 - 1.8 +++ openpkg-src/ss5/ss5.spec 7 Jul 2009 21:00:20 - 1.9 @@ -24,8 +24,8 @@ # FIXME: rse: run-command and configuration still missing # package version -%define V_opkg 3.7.8.7 -%define V_dist 3.7.8-7 +%define V_opkg 3.7.8.8 +%define V_dist 3.7.8-8 %define V_subdir 3.7.8 # package information @@ -39,7 +39,7 @@ Group:Network License: GPL Version: %{V_opkg} -Release: 20090703 +Release: 20090707 # list of sources Source0: http://switch.dl.sourceforge.net/ss5/ss5-%{V_dist}.tar.gz @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ss5/ ss5.patch ss5.spec
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: 03-Jul-2009 19:48:35 Branch: HEAD Handle: 2009070318483500 Modified files: openpkg-src/ss5 ss5.patch ss5.spec Log: upgrading package: ss5 3.7.8.6 -> 3.7.8.7 Summary: RevisionChanges Path 1.2 +9 -9 openpkg-src/ss5/ss5.patch 1.8 +2 -2 openpkg-src/ss5/ss5.spec patch -p0 <<'@@ .' Index: openpkg-src/ss5/ss5.patch $ cvs diff -u -r1.1 -r1.2 ss5.patch --- openpkg-src/ss5/ss5.patch 27 Mar 2009 14:44:24 - 1.1 +++ openpkg-src/ss5/ss5.patch 3 Jul 2009 17:48:35 - 1.2 @@ -1,6 +1,6 @@ Index: Makefile.in --- Makefile.in.orig 2009-03-24 21:28:22 +0100 -+++ Makefile.in 2009-03-27 15:37:11 +0100 Makefile.in 2009-07-03 19:43:16 +0200 @@ -42,32 +42,6 @@ @( cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) @( cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) @@ -52,7 +52,7 @@ @( if [ -f $(dst_dir)$(bin_path_base)/ss5 ]; then rm -f $(dst_dir)$(bin_path_base)/ss5; fi ) Index: build/mod_top.mk --- build/mod_top.mk.orig2009-03-24 21:28:22 +0100 -+++ build/mod_top.mk 2009-03-27 15:35:33 +0100 build/mod_top.mk 2009-07-03 19:43:16 +0200 @@ -24,8 +24,8 @@ top_srcd...@top_srcdir@ top_buildd...@top_builddir@ @@ -65,9 +65,9 @@ CC = @CC@ Index: configure configure.orig 2009-03-24 22:00:16 +0100 -+++ configure2009-03-27 15:35:33 +0100 -@@ -5593,15 +5593,15 @@ +--- configure.orig 2009-06-22 03:23:18 +0200 configure2009-07-03 19:44:58 +0200 +@@ -6399,15 +6399,15 @@ # Checks for OS if test "$OS" = "Linux"; then CFLAGS="$CFLAGS -DLINUX" @@ -75,22 +75,22 @@ + LIBS="$LIBS -rdynamic -ldl -lssl -lldap -lpam -lpam_misc" fi; if test "$OS" = "SunOS"; then -- CFLAGS="$CFLAGS -DSOLARIS -O2 -L/usr/local/lib -R/usr/local/lib" +- CFLAGS="$CFLAGS -DSOLARIS -fPIC -O2 -L/usr/local/lib -R/usr/local/lib" - LIBS="-lsocket -lnsl -lssl -ldl -lldap -lpam" -+ CFLAGS="$CFLAGS -DSOLARIS -O2" ++ CFLAGS="$CFLAGS -DSOLARIS -fPIC -O2" + LIBS="$LIBS -lsocket -lnsl -lssl -ldl -lldap -lpam" fi; if test "$OS" = "FreeBSD"; then - CFLAGS="$CFLAGS -DFREEBSD -pthread -export-dynamic -I/usr/local/include" - LIBS="-lpam -lldap -lc -L /usr/local/lib" + CFLAGS="$CFLAGS -DFREEBSD -pthread -export-dynamic" -+ LIBS="$LIBS -lpam -lldap -lc" ++ LIBS="$LIBS -lpam -lldap -lc -L /usr/local/lib" CPP="g++" fi; Index: src/Makefile.in --- src/Makefile.in.orig 2009-03-24 21:28:23 +0100 -+++ src/Makefile.in 2009-03-27 15:35:33 +0100 src/Makefile.in 2009-07-03 19:43:16 +0200 @@ -18,10 +18,10 @@ SRVOBJ = SS5Srv.o @@ . patch -p0 <<'@@ .' Index: openpkg-src/ss5/ss5.spec $ cvs diff -u -r1.7 -r1.8 ss5.spec --- openpkg-src/ss5/ss5.spec 3 Jul 2009 09:14:04 - 1.7 +++ openpkg-src/ss5/ss5.spec 3 Jul 2009 17:48:35 - 1.8 @@ -24,8 +24,8 @@ # FIXME: rse: run-command and configuration still missing # package version -%define V_opkg 3.7.8.6 -%define V_dist 3.7.8-6 +%define V_opkg 3.7.8.7 +%define V_dist 3.7.8-7 %define V_subdir 3.7.8 # package information @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ss5/ ss5.patch ss5.spec
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: 27-Mar-2009 15:44:24 Branch: HEAD Handle: 2009032714442400 Added files: openpkg-src/ss5 ss5.patch ss5.spec Log: new package: ss5 3.7.5.2 (SOCKS Server) Summary: RevisionChanges Path 1.1 +107 -0 openpkg-src/ss5/ss5.patch 1.1 +110 -0 openpkg-src/ss5/ss5.spec patch -p0 <<'@@ .' Index: openpkg-src/ss5/ss5.patch $ cvs diff -u -r0 -r1.1 ss5.patch --- /dev/null 2009-03-27 15:44:24 +0100 +++ ss5.patch 2009-03-27 15:44:24 +0100 @@ -0,0 +1,107 @@ +Index: Makefile.in +--- Makefile.in.orig 2009-03-24 21:28:22 +0100 Makefile.in 2009-03-27 15:37:11 +0100 +@@ -42,32 +42,6 @@ + @( cp modules/mod_statistics/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) + @( cp modules/mod_balance/SS5Logo.jpg $(dst_dir)$(lib_path_base)/ss5/ ) + +-@( if [ $(OS) = "Linux" ]; then \ +-if [ ! -d $(dst_dir)/etc/rc.d/init.d ]; then mkdir -p $(dst_dir)/etc/rc.d/init.d; fi ; \ +-fi ) +-@( if [ $(OS) = "Linux" ]; then \ +-if [ ! -f $(dst_dir)/etc/rc.d/init.d/ss5 ]; then cp conf/ss5.init $(dst_dir)/etc/rc.d/init.d/ss5; \ +-else cp conf/ss5.init $(dst_dir)/etc/rc.d/init.d/ss5.rpmnew ; fi ; \ +-fi ) +-@( if [ $(OS) = "Linux" ]; then \ +-if [ ! -d $(dst_dir)/etc/sysconfig ]; then mkdir -p $(dst_dir)/etc/sysconfig; fi ; \ +-fi ) +-@( if [ $(OS) = "Linux" ]; then \ +-if [ ! -f $(dst_dir)/etc/sysconfig/ss5 ]; then cp conf/ss5.sysconfig $(dst_dir)/etc/sysconfig/ss5; \ +-else cp conf/ss5.sysconfig $(dst_dir)/etc/sysconfig/ss5.rpmnew ; fi ; \ +-fi ) +-@( if [ $(OS) = "SunOS" ]; then \ +-if [ ! -d $(dst_dir)/etc/init.d ]; then mkdir -p $(dst_dir)/etc/init.d; fi ; \ +-fi ) +-@( if [ $(OS) = "SunOS" ]; then \ +-if [ ! -f $(dst_dir)/etc/init.d/ss5 ]; then cp conf/ss5.init $(dst_dir)/etc/init.d/ss5; \ +-else cp conf/ss5.init $(dst_dir)/etc/init.d/ss5.rpmnew ; fi ; \ +-fi ) +-@( if [ $(OS) = "FreeBSD" ]; then \ +-if [ ! -f /usr/local/etc/rc.d/ss5 ]; then cp conf/ss5.init /usr/local/etc/rc.d/ss5; \ +-else cp conf/ss5.init /usr/local/etc/rc.d/ss5.rpmnew ; fi ; \ +-fi ) +- + @( if [ ! -d $(dst_dir)$(doc_path_base)/ss5 ]; then mkdir -p $(dst_dir)$(doc_path_base)/ss5; fi ) + @( cp License $(dst_dir)$(doc_path_base)/ss5 ) + @( cp -r doc/ldap/* $(dst_dir)$(doc_path_base)/ss5 ) +@@ -95,15 +69,6 @@ + @( if [ ! -f $(dst_dir)$(conf_path_base)/ss5/ss5.passwd ]; then cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5; \ + else cp conf/ss5.passwd $(dst_dir)$(conf_path_base)/ss5/ss5.passwd.rpmnew ; fi ) + +-@( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \ +-if [ ! -d $(dst_dir)/etc/pam.d ]; then mkdir -p $(dst_dir)/etc/pam.d; fi ; \ +-fi ) +-@( if [ $(OS) = "Linux" ] || [ $(OS) = "FreeBSD" ]; then \ +-if [ ! -f $(dst_dir)/etc/pam.d/ss5 ]; then cp doc/pam/examples/ss5.pam $(dst_dir)/etc/pam.d/ss5; \ +-else cp doc/pam/examples/ss5.pam $(dst_dir)/etc/pam.d/ss5.rpmnew ; fi ; \ +-fi ) +- +- + .PHONY : uninstall + uninstall: + @( if [ -f $(dst_dir)$(bin_path_base)/ss5 ]; then rm -f $(dst_dir)$(bin_path_base)/ss5; fi ) +Index: build/mod_top.mk +--- build/mod_top.mk.orig2009-03-24 21:28:22 +0100 build/mod_top.mk 2009-03-27 15:35:33 +0100 +@@ -24,8 +24,8 @@ + top_srcd...@top_srcdir@ + top_buildd...@top_builddir@ + +-cfla...@cflags@ -I . -I $(top_srcdir)/include -shared -fPIC @EXTRA_CFLAGS@ ++cfla...@cflags@ @CPPFLAGS@ -I . -I $(top_srcdir)/include -shared -fPIC @EXTRA_CFLAGS@ + +-LIBS = -lpthread ++LIBS = @LDFLAGS@ @LIBS@ -lpthread + + CC = @CC@ +Index: configure +--- configure.orig 2009-03-24 22:00:16 +0100 configure2009-03-27 15:35:33 +0100 +@@ -5593,15 +5593,15 @@ + # Checks for OS + if test "$OS" = "Linux"; then +CFLAGS="$CFLAGS -DLINUX" +- LIBS="-rdynamic -ldl -lssl -lldap -lpam -lpam_misc" ++ LIBS="$LIBS -rdynamic -ldl -lssl -lldap -lpam -lpam_misc" + fi; + if test "$OS" = "SunOS"; then +- CFLAGS="$CFLAGS -DSOLARIS -O2 -L/usr/local/lib -R/usr/local/lib" +- LIBS="-lsocket -lnsl -lssl -ldl -lldap -lpam" ++ CFLAGS="$CFLAGS -DSOLARIS -O2" ++ LIBS="$LIBS -lsocket -lnsl -lssl -ldl -lldap -lpam" + fi; + if test "$OS" = "FreeBSD"; then +- CFLAGS="$CFLAGS -DFR