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: Revision Changes 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.orig 2009-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 ++++ configure 2009-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 -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" + 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 +@@ -18,10 +18,10 @@ + SRVOBJ = SS5Srv.o + + +-cfla...@cflags@ -I . -I ../include @EXTRA_CFLAGS@ +-srvcfla...@cflags@ -I . -I ../include @EXTRA_CFLAGS@ ++cfla...@cflags@ @CPPFLAGS@ -I . -I ../include @EXTRA_CFLAGS@ ++srvcfla...@cflags@ @CPPFLAGS@ -I . -I ../include @EXTRA_CFLAGS@ + +-LIBS = -lpthread @LIBS@ @EXTRA_LIBS@ ++LIBS = @LDFLAGS@ -lpthread @LIBS@ @EXTRA_LIBS@ + + CC = gcc + @@ . patch -p0 <<'@@ .' Index: openpkg-src/ss5/ss5.spec ============================================================================ $ cvs diff -u -r0 -r1.1 ss5.spec --- /dev/null 2009-03-27 15:44:24 +0100 +++ ss5.spec 2009-03-27 15:44:24 +0100 @@ -0,0 +1,110 @@ +## +## ss5.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/> +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# FIXME: rse: run-command and configuration still missing + +# package version +%define V_opkg 3.7.5.2 +%define V_dist 3.7.5-2 +%define V_subdir 3.7.5 + +# package information +Name: ss5 +Summary: SOCKS Server +URL: http://ss5.sourceforge.net/ +Vendor: Matteo Ricchetti +Packager: OpenPKG Foundation e.V. +Distribution: OpenPKG Community +Class: EVAL +Group: Network +License: GPL +Version: %{V_opkg} +Release: 20090327 + +# list of sources +Source0: http://switch.dl.sourceforge.net/ss5/ss5-%{V_dist}.tar.gz +Patch0: ss5.patch + +# build information +Prefix: %{l_prefix} +BuildRoot: %{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20060823 +PreReq: OpenPKG, openpkg >= 20060823 +BuildPreReq: openldap, openssl +PreReq: openldap, openssl +AutoReq: no +AutoReqProv: no + +%description + SS5 is a SOCKS server that implements the SOCKS v4 and v5 protocols. + +%track + prog ss5 = { + version = %{version} + url = http://prdownloads.sourceforge.net/ss5/ + regex = ss5-(__VER__)\.tar\.gz + } + +%prep + %setup -q -n ss5-%{V_subdir} + %patch -p0 + +%build + CC="%{l_cc}" \ + CXX="%{l_cxx}" \ + CFLAGS="%{l_cflags -O}" \ + CXXFLAGS="%{l_cxxflags -O}" \ + CPPFLAGS="%{l_cppflags}" \ + LDFLAGS="%{l_ldflags}" \ + LIBS="-lldap -llber -lssl -lcrypto" \ + ./configure \ + --prefix=%{l_prefix} \ + --with-configfile="%{l_prefix}/etc/ss5/ss5.cfg" \ + --with-passwordfile="%{l_prefix}/etc/ss5/ss5.passwd" \ + --with-logfile="%{l_prefix}/var/ss5/ss5.log" \ + --with-profilepath="%{l_prefix}/var/ss5/profile" \ + --with-libpath="%{l_prefix}/libexec" \ + --with-tracepath="%{l_prefix}/var/ss5/trace" \ + --with-defaultaddr="127.0.0.1" \ + --with-defaultuser="%{l_nusr}" \ + --with-confpathbase="%{l_prefix}/etc" \ + --with-binpathbase="%{l_prefix}/bin" \ + --with-docpathbase="%{l_prefix}/share" \ + --with-manpathbase="%{l_prefix}/man" \ + --with-logpathbase="%{l_prefix}/var" \ + --with-tracepathbase="%{l_prefix}/var" + %{l_make} %{l_mflags} + +%install + rm -rf $RPM_BUILD_ROOT + %{l_make} %{l_mflags} install dst_dir=$RPM_BUILD_ROOT%{l_prefix} + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ + %{l_files_std} \ + '%config %{l_prefix}/etc/ss5/*' + +%files -f files + +%clean + rm -rf $RPM_BUILD_ROOT + @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org