head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2009.07.07.21.00.20;	author rse;	state Exp;
branches;
next	1.2;
commitid	BepjEZslIpLP4PUt;

1.2
date	2009.07.03.17.48.35;	author rse;	state Exp;
branches;
next	1.1;
commitid	t85WMCJylxI09iUt;

1.1
date	2009.03.27.14.44.24;	author rse;	state Exp;
branches;
next	;
commitid	T66M8wGRprY8hGHt;


desc
@@


1.3
log
@upgrading package: ss5 3.7.8.7 -> 3.7.8.8
@
text
@Index: Makefile.in
--- Makefile.in.orig	2009-03-24 21:28:22 +0100
+++ 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/ )
 
-	@@( 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.orig	2009-03-24 21:28:22 +0100
+++ build/mod_top.mk	2009-07-07 22:38:17 +0200
@@@@ -24,8 +24,8 @@@@
 top_srcdir=@@top_srcdir@@
 top_builddir=@@top_builddir@@
 
-CFLAGS=@@CFLAGS@@ -I . -I $(top_srcdir)/include -shared -fPIC  @@EXTRA_CFLAGS@@
+CFLAGS=@@CFLAGS@@ @@CPPFLAGS@@ -I . -I $(top_srcdir)/include -shared -fPIC  @@EXTRA_CFLAGS@@
 
-LIBS = -lpthread
+LIBS = @@LDFLAGS@@ @@LIBS@@ -lpthread
 
 CC = @@CC@@
Index: configure
--- configure.orig	2009-06-22 07:29:26 +0200
+++ configure	2009-07-07 22:52:51 +0200
@@@@ -6399,15 +6399,15 @@@@
 # Checks for OS
 if test "$OS" = "Linux"; then
    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;
 if test "$OS" = "SunOS"; then
-   CFLAGS="$CFLAGS -DSOLARIS -fPIC -O2 -L/usr/local/lib -R/usr/local/lib"
-   LIBS="-lsocket -lnsl -lssl -ldl -lldap -lpam"
+   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 -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-07-07 22:38:17 +0200
@@@@ -18,10 +18,10 @@@@
 SRVOBJ  = SS5Srv.o
 
 
-CFLAGS=@@CFLAGS@@ -I . -I ../include  @@EXTRA_CFLAGS@@
-SRVCFLAGS=@@CFLAGS@@ -I . -I ../include @@EXTRA_CFLAGS@@
+CFLAGS=@@CFLAGS@@ @@CPPFLAGS@@ -I . -I ../include  @@EXTRA_CFLAGS@@
+SRVCFLAGS=@@CFLAGS@@ @@CPPFLAGS@@ -I . -I ../include @@EXTRA_CFLAGS@@
 
-LIBS = -lpthread @@LIBS@@ @@EXTRA_LIBS@@
+LIBS = @@LDFLAGS@@ -lpthread @@LIBS@@ @@EXTRA_LIBS@@
 
 CC = gcc
 
@


1.2
log
@upgrading package: ss5 3.7.8.6 -> 3.7.8.7
@
text
@d3 1
a3 1
+++ Makefile.in	2009-07-03 19:43:16 +0200
d55 1
a55 1
+++ build/mod_top.mk	2009-07-03 19:43:16 +0200
d68 2
a69 2
--- configure.orig	2009-06-22 03:23:18 +0200
+++ configure	2009-07-03 19:44:58 +0200
d73 1
a73 1
    CFLAGS="$CFLAGS -DLINUX"
d93 1
a93 1
+++ src/Makefile.in	2009-07-03 19:43:16 +0200
@


1.1
log
@new package: ss5 3.7.5.2 (SOCKS Server)
@
text
@d3 1
a3 1
+++ Makefile.in	2009-03-27 15:37:11 +0100
d55 1
a55 1
+++ build/mod_top.mk	2009-03-27 15:35:33 +0100
d68 3
a70 3
--- configure.orig	2009-03-24 22:00:16 +0100
+++ configure	2009-03-27 15:35:33 +0100
@@@@ -5593,15 +5593,15 @@@@
d78 1
a78 1
-   CFLAGS="$CFLAGS -DSOLARIS -O2 -L/usr/local/lib -R/usr/local/lib"
d80 1
a80 1
+   CFLAGS="$CFLAGS -DSOLARIS -O2"
d87 1
a87 1
+   LIBS="$LIBS -lpam -lldap -lc"
d93 1
a93 1
+++ src/Makefile.in	2009-03-27 15:35:33 +0100
@