[CVS] OpenPKG: openpkg-src/gcc41/ gcc41.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 08:01:11 Branch: HEAD Handle: 2005072407011100 Modified files: openpkg-src/gcc41 gcc41.spec Log: upgrading package: gcc41 4.1s20050716 - 4.1s20050723 Summary: RevisionChanges Path 1.15+2 -2 openpkg-src/gcc41/gcc41.spec patch -p0 '@@ .' Index: openpkg-src/gcc41/gcc41.spec $ cvs diff -u -r1.14 -r1.15 gcc41.spec --- openpkg-src/gcc41/gcc41.spec 17 Jul 2005 09:12:39 - 1.14 +++ openpkg-src/gcc41/gcc41.spec 24 Jul 2005 06:01:11 - 1.15 @@ -27,7 +27,7 @@ # package version %define V_full 4.1 %define V_comp 41 -%define V_snap 20050716 +%define V_snap 20050723 # package information Name: gcc41 @@ -40,7 +40,7 @@ Group:Compiler License: GPL Version: %{V_full}s%{V_snap} -Release: 20050717 +Release: 20050724 # package options %option with_cxx yes @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc/ gcc.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 09:15:08 Branch: HEAD Handle: 2005072408150800 Modified files: openpkg-src/gcc gcc.spec Log: make post-adjustments more deterministically by first moving then then removing. This way the order of the partly nested directories do not matter any more. Summary: RevisionChanges Path 1.111 +5 -1 openpkg-src/gcc/gcc.spec patch -p0 '@@ .' Index: openpkg-src/gcc/gcc.spec $ cvs diff -u -r1.110 -r1.111 gcc.spec --- openpkg-src/gcc/gcc.spec 7 Jul 2005 08:28:02 - 1.110 +++ openpkg-src/gcc/gcc.spec 24 Jul 2005 07:15:08 - 1.111 @@ -37,7 +37,7 @@ Group:Compiler License: GPL Version: %{V_full} -Release: 20050707 +Release: 20050724 # package options %option with_cxx yes @@ -246,11 +246,15 @@ # cleanup installation tree mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/ +dirs= for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do subdir=`echo $multilib | sed -e 's/;.*$//'` [ .$subdir = .. ] continue mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/ +dirs=$dirs $subdir +done +for subdir in $dirs; do rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir done mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc41/ gcc41.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 09:22:25 Branch: HEAD Handle: 2005072408222500 Modified files: openpkg-src/gcc41 gcc41.spec Log: make post-adjustments more deterministically by first moving then removing. This way the order of the partly nested directories do not matter any more. Summary: RevisionChanges Path 1.16+4 -0 openpkg-src/gcc41/gcc41.spec patch -p0 '@@ .' Index: openpkg-src/gcc41/gcc41.spec $ cvs diff -u -r1.15 -r1.16 gcc41.spec --- openpkg-src/gcc41/gcc41.spec 24 Jul 2005 06:01:11 - 1.15 +++ openpkg-src/gcc41/gcc41.spec 24 Jul 2005 07:22:25 - 1.16 @@ -236,11 +236,15 @@ # cleanup installation tree mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/ +dirs= for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do subdir=`echo $multilib | sed -e 's/;.*$//'` [ .$subdir = .. ] continue mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/ +dirs=$dirs $subdir +done +for subdir in $dirs; do rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir done mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc33/ gcc33.patch gcc33.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 09:25:18 Branch: HEAD Handle: 2005072408251800 Removed files: openpkg-src/gcc33 gcc33.patch gcc33.spec Log: remove old gcc 3.3 now that gcc 3.4 is stable since a longer time and the all-dancing-all-singing gcc 4.0 is already starting to take over Summary: RevisionChanges Path 1.9 +0 -39 openpkg-src/gcc33/gcc33.patch 1.55+0 -289openpkg-src/gcc33/gcc33.spec rm -f openpkg-src/gcc33/gcc33.patch '@@ .' Index: openpkg-src/gcc33/gcc33.patch [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/gcc33/gcc33.spec '@@ .' Index: openpkg-src/gcc33/gcc33.spec [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tsocks/ tsocks.conf tsocks.patch tsocks.spe...
+Version: %{V_opkg} +Release: 20050724 + +# list of sources +Source0: http://ftp1.sourceforge.net/tsocks/tsocks-%{V_dist}.tar.gz +Source1: tsocks.conf +Patch0: tsocks.patch + +# build information +Prefix: %{l_prefix} +BuildRoot:%{l_buildroot} +BuildPreReq: OpenPKG, openpkg = 20040130, gcc +PreReq: OpenPKG, openpkg = 20040130 +AutoReq: no +AutoReqProv: no + +%description +TSOCKS' role is to allow non-SOCKS aware applications (e.g telnet, +ssh, ftp etc) to use SOCKS without any modification. It does this by +intercepting the calls that applications make to establish network +connections and negotating them through a SOCKS server as necessary. + +%track +prog tsocks = { +version = %{version} +url = ftp://ftp.tsocks.org/pub/tsocks/ +regex = tsocks-(__VER__)\.tar\.gz +} + +%prep +%setup -q -n tsocks-%{V_base} +%patch -p0 +%{l_shtool} subst \ +-e 's;/usr/lib/libtsocks;%{l_prefix}/lib/tsocks/libtsocks;g' \ +tsocks + +%build +if [ ! -f /lib/libdl.so ] [ ! -f /usr/lib/libdl.so ]; then +%{l_shtool} subst -e 's;-ldl;-lc;' configure +fi +CC=%{l_cc} \ +CFLAGS=%{l_cflags -O} \ +CPPFLAGS=%{l_cppflags} \ +LDFLAGS=%{l_ldflags} \ +./configure \ +--prefix=%{l_prefix} \ +--libdir=%{l_prefix}/lib/tsocks \ +--with-conf=%{l_prefix}/etc/tsocks/tsocks.conf +%{l_make} %{l_mflags -O} + +%install +rm -rf $RPM_BUILD_ROOT +%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT +%{l_shtool} mkdir -f -p -m 755 \ +$RPM_BUILD_ROOT%{l_prefix}/etc/tsocks +%{l_shtool} install -c -m 755 \ +%{SOURCE tsocks.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/tsocks/ +%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ +%{l_files_std} \ +'%config %{l_prefix}/etc/tsocks/tsocks.conf' + +%files -f files + +%clean +rm -rf $RPM_BUILD_ROOT + @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc40/ gcc40.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 10:27:40 Branch: HEAD Handle: 2005072409274000 Modified files: openpkg-src/gcc40 gcc40.spec Log: rename with_f77 to with_fortran because GCC 4.0 now supports F77 and F95; also use F95 now for Fortran support Summary: RevisionChanges Path 1.36+9 -4 openpkg-src/gcc40/gcc40.spec patch -p0 '@@ .' Index: openpkg-src/gcc40/gcc40.spec $ cvs diff -u -r1.35 -r1.36 gcc40.spec --- openpkg-src/gcc40/gcc40.spec 16 Jun 2005 09:20:37 - 1.35 +++ openpkg-src/gcc40/gcc40.spec 24 Jul 2005 08:27:40 - 1.36 @@ -39,13 +39,13 @@ Group:Compiler License: GPL Version: %{V_full} -Release: 20050616 +Release: 20050724 # package options %option with_cxx yes %option with_objc no %option with_java no -%option with_f77 no +%option with_fortran no %option with_optimize no %option with_profile no %option with_binutils yes @@ -65,6 +65,10 @@ BuildPreReq: binutils = 2.14 PreReq: binutils = 2.14 %endif +%if %{with_fortran} == yes +BuildPreReq: mpfr +PreReq: mpfr +%endif AutoReq: no AutoReqProv: no %if %{with_gcc} == yes @@ -136,8 +140,8 @@ %if %{with_java} == yes l_enable_languages=${l_enable_languages},java %endif -%if %{with_f77} == yes -l_enable_languages=${l_enable_languages},f77 +%if %{with_fortran} == yes +l_enable_languages=${l_enable_languages},f95 %endif # disable GNU iconv usage @@ -148,6 +152,7 @@ # configure the package CC=%{l_cc} \ CFLAGS=%{l_cflags} \ +CPPFLAGS=%{l_cppflags} \ CONFIG_SHELL=%{l_bash} \ ../configure \ --cache-file=./config.cache \ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc41/ gcc41.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 10:33:28 Branch: HEAD Handle: 2005072409332800 Modified files: openpkg-src/gcc41 gcc41.spec Log: rename with_f77 to with_fortran because GCC 4.0 now supports F77 and F95; also use F95 now for Fortran support Summary: RevisionChanges Path 1.17+8 -3 openpkg-src/gcc41/gcc41.spec patch -p0 '@@ .' Index: openpkg-src/gcc41/gcc41.spec $ cvs diff -u -r1.16 -r1.17 gcc41.spec --- openpkg-src/gcc41/gcc41.spec 24 Jul 2005 07:22:25 - 1.16 +++ openpkg-src/gcc41/gcc41.spec 24 Jul 2005 08:33:28 - 1.17 @@ -46,7 +46,7 @@ %option with_cxx yes %option with_objc no %option with_java no -%option with_f77 no +%option with_fortran no %option with_optimize no %option with_profile no %option with_binutils yes @@ -66,6 +66,10 @@ BuildPreReq: binutils = 2.14 PreReq: binutils = 2.14 %endif +%if %{with_fortran} == yes +BuildPreReq: mpfr +PreReq: mpfr +%endif AutoReq: no AutoReqProv: no %if %{with_gcc} == yes @@ -140,8 +144,8 @@ %if %{with_java} == yes l_enable_languages=${l_enable_languages},java %endif -%if %{with_f77} == yes -l_enable_languages=${l_enable_languages},f77 +%if %{with_fortran} == yes +l_enable_languages=${l_enable_languages},f95 %endif # disable GNU iconv usage @@ -152,6 +156,7 @@ # configure the package CC=%{l_cc} \ CFLAGS=%{l_cflags} \ +CPPFLAGS=%{l_cppflags} \ CONFIG_SHELL=%{l_bash} \ ../configure \ --cache-file=./config.cache \ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc2/ gcc2.patch gcc2.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 10:43:38 Branch: HEAD Handle: 2005072409433700 Removed files: openpkg-src/gcc2gcc2.patch gcc2.spec Log: remove obsolete GCC 2.95 as this program no longer builds out-of-the-box on mostly all latest OS versions Summary: RevisionChanges Path 1.2 +0 -43 openpkg-src/gcc2/gcc2.patch 1.24+0 -177openpkg-src/gcc2/gcc2.spec rm -f openpkg-src/gcc2/gcc2.patch '@@ .' Index: openpkg-src/gcc2/gcc2.patch [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f openpkg-src/gcc2/gcc2.spec '@@ .' Index: openpkg-src/gcc2/gcc2.spec [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/gcc40/ gcc40.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 10:47:47 Branch: HEAD Handle: 2005072409474700 Modified files: openpkg-src/gcc40 gcc40.spec Log: make post-adjustments more deterministically by first moving then removing. This way the order of the partly nested directories do not matter any more. Summary: RevisionChanges Path 1.37+4 -0 openpkg-src/gcc40/gcc40.spec patch -p0 '@@ .' Index: openpkg-src/gcc40/gcc40.spec $ cvs diff -u -r1.36 -r1.37 gcc40.spec --- openpkg-src/gcc40/gcc40.spec 24 Jul 2005 08:27:40 - 1.36 +++ openpkg-src/gcc40/gcc40.spec 24 Jul 2005 08:47:47 - 1.37 @@ -242,11 +242,15 @@ # cleanup installation tree mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/ +dirs= for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do subdir=`echo $multilib | sed -e 's/;.*$//'` [ .$subdir = .. ] continue mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \ $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/$subdir/ +dirs=$dirs $subdir +done +for subdir in $dirs; do rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir done mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tor/ rc.tor tor.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 11:10:01 Branch: HEAD Handle: 200507241010 Added files: openpkg-src/tor rc.tor tor.spec Log: new package: tor 0.1.0.12 (Anonymous Internet Communication System) Summary: RevisionChanges Path 1.1 +62 -0 openpkg-src/tor/rc.tor 1.1 +111 -0 openpkg-src/tor/tor.spec patch -p0 '@@ .' Index: openpkg-src/tor/rc.tor $ cvs diff -u -r0 -r1.1 rc.tor --- /dev/null 2005-07-24 11:09:42 +0200 +++ rc.tor2005-07-24 11:10:00 +0200 @@ -0,0 +1,62 @@ [EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc +## +## rc.tor -- Run-Commands +## + +%config +tor_enable=$openpkg_rc_def +tor_log_prolog=true +tor_log_epilog=true +tor_log_numfiles=10 +tor_log_minsize=1M +tor_log_complevel=9 + +%common +tor_cfgfile=@l_prefix@/etc/tor/torrc +tor_logfile=@l_prefix@/var/tor/tor.log +tor_pidfile=@l_prefix@/var/tor/tor.pid +tor_datadir=@l_prefix@/var/tor/db +tor_signal () { +[ -f $tor_pidfile ] kill -$1 `cat $tor_pidfile` +} + +%status -u @l_rusr@ -o +tor_usable=unknown +tor_active=no +rcService tor enable yes \ +tor_signal 0 tor_active=yes +echo tor_enable=\$tor_enable\ +echo tor_usable=\$tor_usable\ +echo tor_active=\$tor_active\ + +%start -u @l_rusr@ +rcService tor enable yes || exit 0 +rcService tor active yes exit 0 +@l_prefix@/bin/tor \ +-f $tor_cfgfile \ +--datadirectory $tor_datadir \ +--log notice file $tor_logfile \ +--pidfile $tor_pidfile \ +--runasdaemon 1 + +%stop -u @l_rusr@ +rcService tor enable yes || exit 0 +rcService tor active no exit 0 +tor_signal TERM +sleep 2 +rm -f $tor_pidfile /dev/null 21 || true + +%restart -u @l_rusr@ +rcService tor enable yes || exit 0 +rcService tor active no exit 0 +rc tor stop start + +%daily -u @l_susr@ +rcService tor enable yes || exit 0 +shtool rotate -f \ +-n ${tor_log_numfiles} -s ${tor_log_minsize} -d \ +-z ${tor_log_complevel} -m 664 -o @l_rusr@ -g @l_rgrp@ \ +-P ${tor_log_prolog} \ +-E ${tor_log_epilog}; rc tor restart \ +${tor_logfile} + @@ . patch -p0 '@@ .' Index: openpkg-src/tor/tor.spec $ cvs diff -u -r0 -r1.1 tor.spec --- /dev/null 2005-07-24 11:09:42 +0200 +++ tor.spec 2005-07-24 11:10:01 +0200 @@ -0,0 +1,111 @@ +## +## tor.spec -- OpenPKG RPM Package Specification +## Copyright (c) 2000-2005 OpenPKG Foundation e.V. http://openpkg.net/ +## Copyright (c) 2000-2005 Ralf S. Engelschall http://engelschall.com/ +## +## 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. +## + +# package information +Name: tor +Summary: Anonymous Internet Communication System +URL: http://tor.eff.org/ +Vendor: R. Dingledine N. Mathewson +Packager: OpenPKG +Distribution: OpenPKG +Class:EVAL +Group:Network +License: LGPL +Version: 0.1.0.12 +Release: 20050724 + +# list of sources +Source0: http://tor.eff.org/dist/tor-%{version}.tar.gz +Source1: rc.tor + +# build information +Prefix: %{l_prefix} +BuildRoot:%{l_buildroot} +BuildPreReq
[CVS] OpenPKG: openpkg-src/tor/ rc.tor tor.spec torrc
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:15:07 Branch: HEAD Handle: 2005072418150700 Added files: openpkg-src/tor torrc Modified files: openpkg-src/tor rc.tor tor.spec Log: add a stripped down and cleaned up default configuration Summary: RevisionChanges Path 1.2 +6 -8 openpkg-src/tor/rc.tor 1.2 +3 -0 openpkg-src/tor/tor.spec 1.1 +41 -0 openpkg-src/tor/torrc patch -p0 '@@ .' Index: openpkg-src/tor/rc.tor $ cvs diff -u -r1.1 -r1.2 rc.tor --- openpkg-src/tor/rc.tor24 Jul 2005 09:10:00 - 1.1 +++ openpkg-src/tor/rc.tor24 Jul 2005 17:15:07 - 1.2 @@ -12,10 +12,8 @@ tor_log_complevel=9 %common -tor_cfgfile=@l_prefix@/etc/tor/torrc tor_logfile=@l_prefix@/var/tor/tor.log tor_pidfile=@l_prefix@/var/tor/tor.pid -tor_datadir=@l_prefix@/var/tor/db tor_signal () { [ -f $tor_pidfile ] kill -$1 `cat $tor_pidfile` } @@ -32,12 +30,7 @@ %start -u @l_rusr@ rcService tor enable yes || exit 0 rcService tor active yes exit 0 -@l_prefix@/bin/tor \ --f $tor_cfgfile \ ---datadirectory $tor_datadir \ ---log notice file $tor_logfile \ ---pidfile $tor_pidfile \ ---runasdaemon 1 +@l_prefix@/bin/tor %stop -u @l_rusr@ rcService tor enable yes || exit 0 @@ -51,6 +44,11 @@ rcService tor active no exit 0 rc tor stop start +%reload -u @l_rusr@ +rcService tor enable yes || exit 0 +rcService tor active no exit 0 +tor_signal HUP + %daily -u @l_susr@ rcService tor enable yes || exit 0 shtool rotate -f \ @@ . patch -p0 '@@ .' Index: openpkg-src/tor/tor.spec $ cvs diff -u -r1.1 -r1.2 tor.spec --- openpkg-src/tor/tor.spec 24 Jul 2005 09:10:00 - 1.1 +++ openpkg-src/tor/tor.spec 24 Jul 2005 17:15:07 - 1.2 @@ -38,6 +38,7 @@ # list of sources Source0: http://tor.eff.org/dist/tor-%{version}.tar.gz Source1: rc.tor +Source2: torrc # build information Prefix: %{l_prefix} @@ -96,6 +97,8 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d %{l_shtool} install -c -m 755 %{l_value -s -a} \ %{SOURCE rc.tor} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ +%{l_shtool} install -c -m 755 %{l_value -s -a} \ +%{SOURCE torrc} $RPM_BUILD_ROOT%{l_prefix}/etc/tor/ %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/var/tor/db %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ @@ . patch -p0 '@@ .' Index: openpkg-src/tor/torrc $ cvs diff -u -r0 -r1.1 torrc --- /dev/null 2005-07-24 19:15:06 +0200 +++ torrc 2005-07-24 19:15:07 +0200 @@ -0,0 +1,41 @@ +## +## torrc -- Tor Daemon Configuration +## + +# CLIENT CONFIGURATION + +User @l_rusr@ +Group@l_rgrp@ +RunAsDaemon 1 +DataDirectory@l_prefix@/var/tor/db +PIDFile @l_prefix@/var/tor/tor.pid +Log notice file @l_prefix@/var/tor/tor.log + +SocksPort9050 +SocksBindAddress 127.0.0.1 +SocksPolicy accept 127.0.0.1/8 +SocksPolicy reject * +OutboundBindAddress 0.0.0.0 + +AllowUnverifiedNodes middle,rendezvous +#DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441 +#DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF +#DirServer 86.59.5.130:80847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D + +# SERVER CONFIGURATION + +#HiddenServiceDir@l_prefix@/var/tor/db/service/ +#HiddenServicePort 80 127.0.0.1:80 +#HiddenServicePort 22 127.0.0.1:22 + +#NicknameExampleTOR +#Address tor.example.com +#ContactInfo TOR Administrator [EMAIL PROTECTED] +#ORPort 9001 +#ORBindAddress 0.0.0.0:9001 +#DirPort 9030 +#DirBindAddress 0.0.0.0:9030 +#ExitPolicy accept *:6660-6667,reject *:* +#ExitPolicy accept *:119 +#ExitPolicy reject *:* + @@ . __
[CVS] OpenPKG: openpkg-src/gzip/ gzip.patch gzip.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Matthias Kurz Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:20:26 Branch: HEAD Handle: 2005072418202600 Modified files: openpkg-src/gzipgzip.patch gzip.spec Log: Changed security fix for OpenPKG-SA-2005.009-gzip.html. The previous version caused gzip to always put the results in the current directory. Summary: RevisionChanges Path 1.4 +19 -17 openpkg-src/gzip/gzip.patch 1.37+1 -1 openpkg-src/gzip/gzip.spec patch -p0 '@@ .' Index: openpkg-src/gzip/gzip.patch $ cvs diff -u -r1.3 -r1.4 gzip.patch --- openpkg-src/gzip/gzip.patch 11 Jun 2005 08:06:42 - 1.3 +++ openpkg-src/gzip/gzip.patch 24 Jul 2005 17:20:26 - 1.4 @@ -23,21 +23,23 @@ #ifndef MAXSEG_64K DECLARE(ush, tab_prefix, 1LBITS); #else -@@ -915,6 +946,7 @@ - { - struct stat ostat; /* stat for ofname */ - int flags = O_WRONLY | O_CREAT | O_EXCL | O_BINARY; -+char *baseout; +Index: gzip.c +--- gzip.c.orig 2002-09-28 09:38:43.0 +0200 gzip.c 2005-07-24 18:20:41.621179000 +0200 +@@ -1225,6 +1225,7 @@ + char magic[2]; /* magic header */ + int imagic1; /* like magic[1], but can represent EOF */ + ulg stamp; /* time stamp */ ++char *base2; - if (ascii decompress) { - flags = ~O_BINARY; /* force ascii text mode */ -@@ -927,6 +959,9 @@ - } - /* Create the output file */ - remove_ofname = 1; -+baseout = base_name(ofname); -+strncpy(ofname, baseout, sizeof(ofname)); -+ofname[sizeof(ofname) - 1] = '\0'; - ofd = OPEN(ofname, flags, RW_USER); - if (ofd == -1) { - progerror(ofname); + /* If --force and --stdout, zcat == cat, so do not complain about + * premature end of file: use try_byte instead of get_byte. +@@ -1324,6 +1325,8 @@ + error(corrupted input -- file name too large); + } + } ++base2 = base_name (base); ++strcpy(base, base2); + /* If necessary, adapt the name to local OS conventions: */ + if (!list) { +MAKE_LEGAL_NAME(base); @@ . patch -p0 '@@ .' Index: openpkg-src/gzip/gzip.spec $ cvs diff -u -r1.36 -r1.37 gzip.spec --- openpkg-src/gzip/gzip.spec11 Jun 2005 08:06:42 - 1.36 +++ openpkg-src/gzip/gzip.spec24 Jul 2005 17:20:26 - 1.37 @@ -33,7 +33,7 @@ Group:Compression License: GPL Version: 1.3.5 -Release: 20050611 +Release: 20050724 # list of sources Source0: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/ncurses/ ncurses.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:21:37 Branch: HEAD Handle: 2005072418213700 Modified files: openpkg-src/ncurses ncurses.spec Log: upgrading package: ncurses 5.4.20050716 - 5.4.20050723 Summary: RevisionChanges Path 1.218 +5 -3 openpkg-src/ncurses/ncurses.spec patch -p0 '@@ .' Index: openpkg-src/ncurses/ncurses.spec $ cvs diff -u -r1.217 -r1.218 ncurses.spec --- openpkg-src/ncurses/ncurses.spec 17 Jul 2005 08:50:45 - 1.217 +++ openpkg-src/ncurses/ncurses.spec 24 Jul 2005 17:21:37 - 1.218 @@ -43,9 +43,10 @@ %define V_patch17 20050625 %define V_patch18 20050702 %define V_patch19 20050716 +%define V_patch20 20050723 %define V_patchB %{V_patch1} -%define V_patchL %{V_patch19} -%define V_patches 19 +%define V_patchL %{V_patch20} +%define V_patches 20 # package information Name: ncurses @@ -58,7 +59,7 @@ Group:Terminal License: GPL Version: %{V_base}.%{V_patchL} -Release: 20050717 +Release: 20050724 # list of sources Source0: ftp://invisible-island.net/ncurses/ncurses-%{V_base}.tar.gz @@ -81,6 +82,7 @@ Patch17: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch17}.patch.gz Patch18: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch18}.patch.gz Patch19: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch19}.patch.gz +Patch20: ftp://invisible-island.net/ncurses/%{V_base}/ncurses-%{V_base}-%{V_patch20}.patch.gz Patch100: ncurses.patch # build information @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/perl-www/ perl-www.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:21:41 Branch: HEAD Handle: 2005072418214100 Modified files: openpkg-src/perl-wwwperl-www.spec Log: modifying package: perl-www-5.8.7 20050721 - 20050724 Summary: RevisionChanges Path 1.208 +2 -2 openpkg-src/perl-www/perl-www.spec patch -p0 '@@ .' Index: openpkg-src/perl-www/perl-www.spec $ cvs diff -u -r1.207 -r1.208 perl-www.spec --- openpkg-src/perl-www/perl-www.spec21 Jul 2005 19:42:08 - 1.207 +++ openpkg-src/perl-www/perl-www.spec24 Jul 2005 17:21:41 - 1.208 @@ -64,7 +64,7 @@ %define V_www_search_yahoo 2.403 %define V_www_search_lycos 2.221 %define V_www_search_alltheweb 1.5 -%define V_www_opensearch 0.02 +%define V_www_opensearch 0.03 %define V_www_wikipedia1.7 %define V_http_daemon_ssl 1.02 %define V_http_proxy 0.15 @@ -82,7 +82,7 @@ Group:Language License: GPL/Artistic Version: %{V_perl} -Release: 20050721 +Release: 20050724 # list of sources Source0: http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tor/ tor.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:22:59 Branch: HEAD Handle: 2005072418225900 Modified files: openpkg-src/tor tor.spec Log: provide the usual %post/%preun commands for a daemon based package Summary: RevisionChanges Path 1.3 +15 -0 openpkg-src/tor/tor.spec patch -p0 '@@ .' Index: openpkg-src/tor/tor.spec $ cvs diff -u -r1.2 -r1.3 tor.spec --- openpkg-src/tor/tor.spec 24 Jul 2005 17:15:07 - 1.2 +++ openpkg-src/tor/tor.spec 24 Jul 2005 17:22:59 - 1.3 @@ -112,3 +112,18 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +# after upgrade, restart service +[ $1 -eq 2 ] || exit 0 +eval `%{l_rc} tor status 2/dev/null` +[ .$tor_active = .yes ] %{l_rc} tor restart +exit 0 + +%preun +# before erase, stop service and remove log files +[ $1 -eq 0 ] || exit 0 +%{l_rc} tor stop 2/dev/null +rm -f $RPM_INSTALL_PREFIX/var/tor/tor.* /dev/null 21 || true +rm -f $RPM_INSTALL_PREFIX/var/tor/db/* /dev/null 21 || true +exit 0 + @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/tomcat-adapter/ tomcat-adapter.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:34:04 Branch: HEAD Handle: 2005072418340400 Modified files: openpkg-src/tomcat-adapter tomcat-adapter.spec Log: upgrading package: tomcat-adapter 5.5.9 - 5.5.10 Summary: RevisionChanges Path 1.29+2 -2 openpkg-src/tomcat-adapter/tomcat-adapter.spec patch -p0 '@@ .' Index: openpkg-src/tomcat-adapter/tomcat-adapter.spec $ cvs diff -u -r1.28 -r1.29 tomcat-adapter.spec --- openpkg-src/tomcat-adapter/tomcat-adapter.spec8 Apr 2005 19:44:23 - 1.28 +++ openpkg-src/tomcat-adapter/tomcat-adapter.spec24 Jul 2005 17:34:04 - 1.29 @@ -32,8 +32,8 @@ Class:EVAL Group:Web License: Apache Software License 1.1 -Version: 5.5.9 -Release: 20050408 +Version: 5.5.10 +Release: 20050724 # package options %option with_eapi no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openssh/ openssh.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:58:30 Branch: HEAD Handle: 2005072418583000 Modified files: openpkg-src/openssh openssh.spec Log: optionally add connect utility which is a simple relaying command (for use with the ProxyCommand directory in ~/ssh/config) to make outgoing network connections via SOCKS or HTTP/HTTPS proxies Summary: RevisionChanges Path 1.149 +28 -1 openpkg-src/openssh/openssh.spec patch -p0 '@@ .' Index: openpkg-src/openssh/openssh.spec $ cvs diff -u -r1.148 -r1.149 openssh.spec --- openpkg-src/openssh/openssh.spec 29 May 2005 08:10:06 - 1.148 +++ openpkg-src/openssh/openssh.spec 24 Jul 2005 17:58:30 - 1.149 @@ -31,6 +31,7 @@ %define V_ldap_base 3.7.1p2 %define V_ldap_vers1 v2.01 %define V_ldap_vers2 v201 +%define V_connect 1.95 # package information Name: openssh @@ -43,7 +44,7 @@ Group:Security License: BSD Version: %{V_base}%{V_portable} -Release: 20050529 +Release: 20050724 # package options %option with_fsl yes @@ -56,6 +57,7 @@ %option with_watchdog no %option with_wrap no %option with_x11 no +%option with_connect no # list of sources Source0: ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz @@ -67,6 +69,7 @@ Source6: ssh-keyman Source7: ssh-keyman.1 Source8: ssh-keyman.pod +Source9: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/openssh-connect/openssh-connect-%{V_connect}.tar.gz Patch0: openssh.patch Patch1: openssh.patch.chroot Patch2: openssh.patch.alias @@ -135,6 +138,9 @@ %prep # unpack and patch distribution %setup -q +%if %{with_connect} == yes +%setup -q -D -T -a 9 +%endif %patch -p0 -P 0 %{l_shtool} subst \ -e 's;@l_openpkg_release@;%{l_openpkg_release -F OpenPKG-%s};' \ @@ -227,6 +233,19 @@ # build package %{l_make} %{l_mflags -O} +%if %{with_connect} == yes +# build proxy connect utility +( cd openssh-connect + CC=%{l_cc} \ + CFLAGS=%{l_cflags -O} \ + CPPFLAGS=%{l_cppflags} \ + LDFLAGS=%{l_ldflags} \ + ./configure \ + --prefix=%{l_prefix} + %{l_make} %{l_mflags} +) || exit $? +%endif + %install rm -rf $RPM_BUILD_ROOT @@ -240,6 +259,14 @@ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2/dev/null || true strip $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh/* 2/dev/null || true +%if %{with_connect} == yes +# install proxy connect utility +( cd openssh-connect + %{l_shtool} install -c -s -m 755 \ + connect $RPM_BUILD_ROOT%{l_prefix}/bin/ssh-connect +) || exit $? +%endif + # install ssh-askpass wrapper %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/libexec/openssh @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openssh/ openssh.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 19:59:36 Branch: HEAD Handle: 2005072418593600 Modified files: openpkg-src/openssh openssh.spec Log: sort connect before the patching options Summary: RevisionChanges Path 1.150 +1 -1 openpkg-src/openssh/openssh.spec patch -p0 '@@ .' Index: openpkg-src/openssh/openssh.spec $ cvs diff -u -r1.149 -r1.150 openssh.spec --- openpkg-src/openssh/openssh.spec 24 Jul 2005 17:58:30 - 1.149 +++ openpkg-src/openssh/openssh.spec 24 Jul 2005 17:59:36 - 1.150 @@ -48,6 +48,7 @@ # package options %option with_fsl yes +%option with_connect no %option with_aliasno %option with_chroot no %option with_ldap no @@ -57,7 +58,6 @@ %option with_watchdog no %option with_wrap no %option with_x11 no -%option with_connect no # list of sources Source0: ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/openpkg/ HISTORY gzip.c openpkg.spec
instead of get_byte. @@ -1359,6 +1350,8 @@ error(corrupted input -- file name too large); } } +base2 = base_name (base); +strcpy(base, base2); /* If necessary, adapt the name to local OS conventions: */ if (!list) { MAKE_LEGAL_NAME(base); @@ . patch -p0 '@@ .' Index: openpkg-src/openpkg/openpkg.spec $ cvs diff -u -r1.433 -r1.434 openpkg.spec --- openpkg-src/openpkg/openpkg.spec 22 Jul 2005 18:20:23 - 1.433 +++ openpkg-src/openpkg/openpkg.spec 24 Jul 2005 18:10:51 - 1.434 @@ -38,7 +38,7 @@ # o any cc(1) # the package version/release -%define V_openpkg 20050722 +%define V_openpkg 20050724 # the used software versions %define V_rpm 4.2.1 @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/apache2/ apache2.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Matthias Kurz Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Jul-2005 21:32:58 Branch: HEAD Handle: 2005072420325800 Modified files: openpkg-src/apache2 apache2.spec Log: incompatible API change in OpenSSL 0.9.8 include/openssl/pem.h: PEM_F_DEF_CALLBACK - PEM_F_PEM_DEF_CALLBACK Summary: RevisionChanges Path 1.63+8 -5 openpkg-src/apache2/apache2.spec patch -p0 '@@ .' Index: openpkg-src/apache2/apache2.spec $ cvs diff -u -r1.62 -r1.63 apache2.spec --- openpkg-src/apache2/apache2.spec 18 Jun 2005 10:23:17 - 1.62 +++ openpkg-src/apache2/apache2.spec 24 Jul 2005 19:32:58 - 1.63 @@ -39,7 +39,7 @@ Group:Web License: ASF Version: %{V_apache} -Release: 20050618 +Release: 20050724 # package options (suexec related) %option with_suexec yes @@ -74,12 +74,12 @@ PreReq: zlib %endif %if %{with_mod_ssl} == yes -BuildPreReq: openssl -PreReq: openssl +BuildPreReq: openssl = 0.9.8 +PreReq: openssl = 0.9.8 %endif %if %{with_mod_ldap} == yes -BuildPreReq: openldap, openssl -PreReq: openldap, openssl +BuildPreReq: openldap, openssl = 0.9.8 +PreReq: openldap, openssl = 0.9.8 %endif %if %{with_mod_perl} == yes BuildPreReq: perl @@ -123,6 +123,9 @@ %if %{with_mod_perl} == yes %setup -q -T -D -a 1 %endif +# incompatible API change in OpenSSL 0.9.8 +%{l_shtool} subst -e 's,PEM_F_DEF_CALLBACK,PEM_F_PEM_DEF_CALLBACK,g' \ +`find . -type f | xargs grep -l PEM_F_DEF_CALLBACK` %build # optionally prepare mod_perl @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org