From f84caf5224668b2deff5d448e6549e6b511e7243 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 9 Sep 2003 20:08:26 +0000 Subject: [PATCH] Alejandro Mery : boehm-gc: fix gcc3-use_system_gc.diff, tested. dante-1.1.14: new package, socks{4,5} server, compiled. ipvs-1.0.10: update. lzo: fix typo. mod_mono-0.40: update, compiled. monodoc-0.5: update, still broken :( mono-xsp-0.5: update, compiled. mono-0.26: update, compiled. openvpn-1.4.3: update. rsbac-v1.2.2: update, patch for 2.4.22. vquota: update for vserver-0.23-ctx17a vserver-0.23-ctx17a: update, patch for 2.4.22. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1351 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + .../mnemoc/boehm-gc/gcc3-use_system_gc.diff | 77 +++++++++---------- package/mnemoc/dante/dante.desc | 44 +++++++++++ package/mnemoc/lvs/lvs.desc | 4 +- package/mnemoc/lzo/lzo.desc | 2 +- package/mnemoc/mod_mono/mod_mono.desc | 8 +- package/mnemoc/mono-doc/mono-doc.desc | 6 +- package/mnemoc/mono-xsp/mono-xsp.conf | 4 +- package/mnemoc/mono-xsp/mono-xsp.desc | 6 +- package/mnemoc/mono/mono.desc | 8 +- package/mnemoc/openvpn/openvpn.desc | 4 +- package/mnemoc/rsbac/rsbac.desc | 16 ++-- package/mnemoc/vquota/vquota.desc | 4 +- package/mnemoc/vserver/vserver.desc | 4 +- 14 files changed, 114 insertions(+), 74 deletions(-) create mode 100644 package/mnemoc/dante/dante.desc diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 65aaac85d..2725251e6 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -7,6 +7,7 @@ - Piotr Esden-Tempski: curl dietlibc fix V2 - added xinerama option to xfree86 - Stefan Paletta: fix mkpkg and fl_stparse + - Alejandro Mery: updates to mnemoc incl. bohem-gc/mono fixes *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff b/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff index 1fd8653da..2810f47c8 100644 --- a/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff +++ b/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff @@ -5,7 +5,7 @@ # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/package/mnemoc/boehm-gc/gcc33-use_system_gc.diff +# ROCK Linux: rock-src/package/mnemoc/boehm-gc/gcc3-use_system_gc.diff # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # # This program is free software; you can redistribute it and/or modify @@ -20,78 +20,71 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- ./Makefile.in.orig 2003-07-12 19:19:25.000000000 -0400 -+++ ./Makefile.in 2003-07-12 19:21:35.000000000 -0400 -@@ -761,7 +761,6 @@ +--- ./Makefile.in.orig 2003-09-02 20:37:57.000000000 -0400 ++++ ./Makefile.in 2003-09-02 20:40:35.000000000 -0400 +@@ -799,7 +799,6 @@ all-target-libffi \ all-target-libjava \ all-target-zlib \ - all-target-boehm-gc \ all-target-qthreads \ - all-target-rda - -@@ -781,7 +780,6 @@ + all-target-bsp \ + all-target-cygmon +@@ -822,7 +821,6 @@ configure-target-libffi \ configure-target-libjava \ configure-target-zlib \ - configure-target-boehm-gc \ configure-target-qthreads \ - configure-target-rda - -@@ -798,7 +796,6 @@ + configure-target-bsp \ + configure-target-cygmon +@@ -839,7 +837,6 @@ check-target-libffi \ check-target-libjava \ check-target-zlib \ - check-target-boehm-gc \ check-target-qthreads \ - check-target-rda + check-target-gperf -@@ -817,7 +814,6 @@ - install-target-libffi \ +@@ -857,7 +854,6 @@ + install-target-bsp \ install-target-libjava \ install-target-zlib \ - install-target-boehm-gc \ install-target-qthreads \ - install-target-rda + install-target-gperf -@@ -898,7 +894,6 @@ +@@ -947,7 +943,6 @@ clean-target-libffi \ clean-target-libjava \ clean-target-zlib \ - clean-target-boehm-gc \ clean-target-qthreads \ - clean-target-rda - -@@ -1654,7 +1649,6 @@ + clean-target-bsp \ + clean-target-cygmon +@@ -1714,8 +1709,6 @@ all-bfd: all-libiberty all-intl all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl all-bison: all-texinfo -configure-target-boehm-gc: $(ALL_GCC_C) configure-target-qthreads +-all-target-boehm-gc: configure-target-boehm-gc + configure-target-bsp: $(ALL_GCC_C) + all-target-bsp: configure-target-bsp all-byacc: - all-bzip2: - all-db: -@@ -1694,8 +1688,8 @@ - all-build-libiberty: configure-build-libiberty +@@ -1770,8 +1763,8 @@ configure-target-libffi: $(ALL_GCC_C) + all-target-libffi: configure-target-libffi -configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi --all-target-libjava: all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi +-all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi +configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-qthreads configure-target-libffi -+all-target-libjava: all-fastjar all-target-zlib all-target-qthreads all-target-libffi ++all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-qthreads all-target-libffi + configure-target-librx: $(ALL_GCC_C) + all-target-librx: configure-target-librx configure-target-libstdc++-v3: $(ALL_GCC_C) - all-target-libstdc++-v3: all-target-libiberty - all-libtool: -@@ -1772,7 +1766,6 @@ - all-target-libffi: configure-target-libffi - all-target-libjava: configure-target-libjava - all-target-zlib: configure-target-zlib --all-target-boehm-gc: configure-target-boehm-gc - all-target-qthreads: configure-target-qthreads - all-target-rda: configure-target-rda - ---- ./libjava/configure.orig 2003-07-14 13:10:59.000000000 -0400 -+++ ./libjava/configure 2003-07-14 13:12:01.000000000 -0400 -@@ -3235,12 +3235,12 @@ +--- ./libjava/configure.orig 2003-09-02 20:40:47.000000000 -0400 ++++ ./libjava/configure 2003-09-02 20:42:22.000000000 -0400 +@@ -3132,12 +3132,12 @@ case "$GC" in boehm) echo "$ac_t""boehm" 1>&6 @@ -100,16 +93,16 @@ + GCLIBS='$(prefix)/lib/libgc.la' + GCINCS='-I$(prefix)/include/gc' JC1GCSPEC='-fuse-boehm-gc' -- GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" -+ #GCTESTSPEC="-L`${PWDCMD-pwd}`/../boehm-gc/.libs -rpath `${PWDCMD-pwd}`/../boehm-gc/.libs" +- GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs" ++ #GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs" - GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`" -+ # GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`" ++ # GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`" GCOBJS=boehm.lo GCHDR=boehm-gc.h cat >> confdefs.h <<\EOF ---- ./libjava/libltdl/configure.orig 2003-07-14 13:12:15.000000000 -0400 -+++ ./libjava/libltdl/configure 2003-07-14 13:13:03.000000000 -0400 +--- ./libjava/libltdl/configure.orig 2003-09-02 20:42:37.000000000 -0400 ++++ ./libjava/libltdl/configure 2003-09-02 20:43:27.000000000 -0400 @@ -2508,8 +2508,8 @@ GCINCS= diff --git a/package/mnemoc/dante/dante.desc b/package/mnemoc/dante/dante.desc new file mode 100644 index 000000000..b83f2c86d --- /dev/null +++ b/package/mnemoc/dante/dante.desc @@ -0,0 +1,44 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/mnemoc/dante/dante.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] socks4 socks5 and msproxy server and client. + +[T] Dante is a free implementation of the proxy protocols socks version 4, +[T] socks version 5 (rfc1928), and msproxy. It can be used as a firewall +[T] between networks. The package consists of two parts, a socks server and +[T] a proxy client which supports socks, msproxy, and HTTP proxies. + +[U] http://www.inet.no/dante/ + +[A] Karls +[M] Alejandro Mery + +[C] extra/network + +[L] BSD +[S] Stable +[V] 1.1.14 +[P] X -----5---9 800.000 + +[D] 2791606265 dante-1.1.14.tar.gz ftp://ftp.inet.no/pub/socks/ + diff --git a/package/mnemoc/lvs/lvs.desc b/package/mnemoc/lvs/lvs.desc index a8c997244..47ffc0e69 100644 --- a/package/mnemoc/lvs/lvs.desc +++ b/package/mnemoc/lvs/lvs.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 1.0.9 +[V] 1.0.10 [P] O -----5---9 789.000 -[D] 1414054743 ipvs-1.0.9.tar.gz http://www.linuxvirtualserver.org/software/kernel-2.4/ +[D] 3925226949 ipvs-1.0.10.tar.gz http://www.linuxvirtualserver.org/software/kernel-2.4/ diff --git a/package/mnemoc/lzo/lzo.desc b/package/mnemoc/lzo/lzo.desc index 80ba82498..96ae34ec6 100644 --- a/package/mnemoc/lzo/lzo.desc +++ b/package/mnemoc/lzo/lzo.desc @@ -23,7 +23,7 @@ [I] LZO compression library -[T] LZO is a portable lossless data compression library written in ANSI C. i +[T] LZO is a portable lossless data compression library written in ANSI C. [T] It offers pretty fast compression and *extremly* fast decompression. [T] Decompression requires no memory. [T] diff --git a/package/mnemoc/mod_mono/mod_mono.desc b/package/mnemoc/mod_mono/mod_mono.desc index 9817caa1c..cb74b6fd1 100644 --- a/package/mnemoc/mod_mono/mod_mono.desc +++ b/package/mnemoc/mod_mono/mod_mono.desc @@ -35,10 +35,12 @@ [L] GPL [S] Stable -[V] 0.3.7 +[V] 0.4.0 [P] X -----5---9 701.000 -[CV-URL] http://www.apacheworld.org/modmono/ +#[CV-URL] http://www.apacheworld.org/modmono/ +[CV-URL] http://www.go-mono.com/download.html -[D] 4246134626 mod_mono-0.3.7.tar.gz http://www.apacheworld.org/modmono/0.3.7/ +#http://www.apacheworld.org/modmono/0.3.7/mod_mono-0.3.7.tar.gz +[D] 1415084089 mod_mono-0.4.tar.gz http://www.go-mono.com/archive/ diff --git a/package/mnemoc/mono-doc/mono-doc.desc b/package/mnemoc/mono-doc/mono-doc.desc index be37cc3e5..7c9bf8a68 100644 --- a/package/mnemoc/mono-doc/mono-doc.desc +++ b/package/mnemoc/mono-doc/mono-doc.desc @@ -37,7 +37,9 @@ [L] GPL [S] Stable -[V] 0.5 +[V] 0.6 [P] X -----5---9 861.000 -[D] 4065981477 monodoc-0.5.tar.gz http://www.go-mono.org/archive/ +[CV-URL] http://www.go-mono.com/download.html + +[D] 1272567227 monodoc-0.6.tar.gz http://www.go-mono.org/archive/ diff --git a/package/mnemoc/mono-xsp/mono-xsp.conf b/package/mnemoc/mono-xsp/mono-xsp.conf index 5d786d2e9..a68915125 100644 --- a/package/mnemoc/mono-xsp/mono-xsp.conf +++ b/package/mnemoc/mono-xsp/mono-xsp.conf @@ -29,9 +29,9 @@ hook_add premake 4 'find . -type d -name CVS | xargs rm -rf' # do the real install pkg_monoxsp_install() { mkdir -p $datadir/xsp - for x in server.exe server.exe.config web.config global.asax + for x in server/*.{exe,config,asax} do - cp -vf server/$x $datadir/xsp/ + cp -vf $x $datadir/xsp/ done cp -vfR server/test $datadir/xsp/ } diff --git a/package/mnemoc/mono-xsp/mono-xsp.desc b/package/mnemoc/mono-xsp/mono-xsp.desc index 0828eba8c..c7a0b1cf4 100644 --- a/package/mnemoc/mono-xsp/mono-xsp.desc +++ b/package/mnemoc/mono-xsp/mono-xsp.desc @@ -43,8 +43,10 @@ [L] GPL [S] Stable -[V] 0.4 +[V] 0.5 [P] X -----5---9 738.000 -[D] 2930056642 xsp-0.4.tar.gz http://www.go-mono.com/archive/ +[CV-URL] http://www.go-mono.com/download.html + +[D] 2230730863 xsp-0.5.tar.gz http://www.go-mono.com/archive/ diff --git a/package/mnemoc/mono/mono.desc b/package/mnemoc/mono/mono.desc index ec89f6c5a..d02485d35 100644 --- a/package/mnemoc/mono/mono.desc +++ b/package/mnemoc/mono/mono.desc @@ -41,10 +41,12 @@ [L] GPL [S] Stable -[V] 0.25 +[V] 0.26 [P] X -----5---9 492.000 -[D] 2078567212 mono-0.25.tar.gz http://www.go-mono.com/archive/ -[D] 357656389 mcs-0.25.tar.gz http://www.go-mono.com/archive/ +[CV-URL] http://www.go-mono.com/download.html + +[D] 2577977248 mono-0.26.tar.gz http://www.go-mono.com/archive/ +[D] 2890045883 mcs-0.26.tar.gz http://www.go-mono.com/archive/ [SRC] mono mcs diff --git a/package/mnemoc/openvpn/openvpn.desc b/package/mnemoc/openvpn/openvpn.desc index a1518da93..5353a1346 100644 --- a/package/mnemoc/openvpn/openvpn.desc +++ b/package/mnemoc/openvpn/openvpn.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 1.4.2 +[V] 1.4.3 [P] X -----5---9 752.000 -[D] 1829966408 openvpn-1.4.2.tar.gz http://dl.sourceforge.net/sourceforge/openvpn/ +[D] 3805923401 openvpn-1.4.3.tar.gz http://dl.sourceforge.net/sourceforge/openvpn/ diff --git a/package/mnemoc/rsbac/rsbac.desc b/package/mnemoc/rsbac/rsbac.desc index 3d01e119b..a9e5e8129 100644 --- a/package/mnemoc/rsbac/rsbac.desc +++ b/package/mnemoc/rsbac/rsbac.desc @@ -43,19 +43,15 @@ [L] GPL [S] Stable -[V] 1.2.1 +[V] 1.2.2 [P] O -----5---9 862.000 [CV-DEL] \.(gz|bz2)$ \.tar$ ^[^0-9]+ .*\.(md5sum|pgpcert)$ -[O] pkg_rsbac_lxpatches="1 3 5" -[O] pkg_rsbac_patches=4 +[O] pkg_rsbac_lxpatches="" +[O] pkg_rsbac_patches="" -[D] 1607147977 rsbac-admin-v1.2.1.tar.bz2 http://www.rsbac.org/code/ -[D] 1107316721 rsbac-v1.2.1.tar.bz2 http://www.rsbac.org/code/ -[D] 3305401454 patch-2.4.20-v1.2.1.gz http://www.rsbac.org/patches/v1.2.1/ -[D] 736693290 rsbac-bugfix-v1.2.1-1.diff http://www.rsbac.org/bugfixes/ -[D] 2618868595 rsbac-bugfix-v1.2.1-3.diff http://www.rsbac.org/bugfixes/ -[D] 1129355150 rsbac-bugfix-v1.2.1-4.diff http://www.rsbac.org/bugfixes/ -[D] 467174495 rsbac-bugfix-v1.2.1-5.diff http://www.rsbac.org/bugfixes/ +[D] 2452966771 rsbac-admin-v1.2.2.tar.bz2 http://www.rsbac.org/code/ +[D] 2259588141 rsbac-v1.2.2.tar.bz2 http://www.rsbac.org/code/ +[D] 2164542933 patch-2.4.22-v1.2.2.gz http://www.rsbac.org/patches/v1.2.2/ diff --git a/package/mnemoc/vquota/vquota.desc b/package/mnemoc/vquota/vquota.desc index 74a3d5e13..e12e899b2 100644 --- a/package/mnemoc/vquota/vquota.desc +++ b/package/mnemoc/vquota/vquota.desc @@ -40,6 +40,6 @@ [D] 982560686 vquota-tools-0.12.tar.bz2 http://www.13thfloor.at/VServer/ [D] 4004901191 linux-2.4.21-ctx17-vquota-0.10.diff.bz2 http://www.13thfloor.at/VServer/ -[D] 3528734261 vserver-0.22-cap_quotactl.diff.bz2 http://www.13thfloor.at/VServer/ -[D] 2882447477 quota-tools-3.07-ctx14-v0.35.diff.bz2 http://www.13thfloor.at/VServer/ +[D] 2125636190 vserver-0.23-cap_quotactl.diff.bz2 http://www.13thfloor.at/VServer/ +[D] 2351796584 quota-tools-3.08-ctx17-v0.35.diff.bz2 http://www.13thfloor.at/VServer/ diff --git a/package/mnemoc/vserver/vserver.desc b/package/mnemoc/vserver/vserver.desc index cf540c405..22fee2c3c 100644 --- a/package/mnemoc/vserver/vserver.desc +++ b/package/mnemoc/vserver/vserver.desc @@ -49,6 +49,4 @@ [CV-DEL] \.src\.tar\.gz$ ^[^0-9]+ .*\.rpm$ [D] 1609639113 vserver-0.23.src.tar.gz ftp://ftp.solucorp.qc.ca/pub/vserver/ -[D] 1108232030 patch-2.4.21-ctx17.diff.bz2 http://www.13thfloor.at/VServer/ -[D] 1224883969 jacques-ctx17a.diff.bz2 http://www.13thfloor.at/VServer/ - +[D] 1431776533 patch-2.4.22-ctx17a.diff.bz2 http://www.13thfloor.at/VServer/