Author: draenog Date: Fri Nov 11 19:32:22 2011 GMT Module: packages Tag: HEAD ---- Log message: - store patches in decompressed files
---- Files affected: packages/mirrordir: mirrordir.spec (1.17 -> 1.18) , mirrordir-datadir-fix.patch (NONE -> 1.1) (NEW), mirrordir-zlib-1.1.3-zfree.patch (NONE -> 1.1) (NEW), mirrordir-datadir-fix.patch.bz2 (1.1 -> NONE) (REMOVED), mirrordir-zlib-1.1.3-zfree.patch.bz2 (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/mirrordir/mirrordir.spec diff -u packages/mirrordir/mirrordir.spec:1.17 packages/mirrordir/mirrordir.spec:1.18 --- packages/mirrordir/mirrordir.spec:1.17 Tue Feb 13 07:46:54 2007 +++ packages/mirrordir/mirrordir.spec Fri Nov 11 20:32:17 2011 @@ -8,8 +8,8 @@ License: GPL Source0: http://mirrordir.sourceforge.net/%{name}-%{version}.tar.gz # Source0-md5: 7671e541b5971ad863bba811ac77f69e -Patch0: %{name}-datadir-fix.patch.bz2 -Patch1: %{name}-zlib-1.1.3-zfree.patch.bz2 +Patch0: %{name}-datadir-fix.patch +Patch1: %{name}-zlib-1.1.3-zfree.patch URL: http://mirrordir.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -143,6 +143,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2011/11/11 19:32:17 draenog +- store patches in decompressed files + Revision 1.17 2007/02/13 06:46:54 glen - tabs in preamble ================================================================ Index: packages/mirrordir/mirrordir-datadir-fix.patch diff -u /dev/null packages/mirrordir/mirrordir-datadir-fix.patch:1.1 --- /dev/null Fri Nov 11 20:32:22 2011 +++ packages/mirrordir/mirrordir-datadir-fix.patch Fri Nov 11 20:32:17 2011 @@ -0,0 +1,51 @@ +diff -urN mirrordir-0.10.49-old/diffie/arc.h mirrordir-0.10.49/diffie/arc.h +--- mirrordir-0.10.49-old/diffie/arc.h Tue Nov 23 09:40:09 1999 ++++ mirrordir-0.10.49/diffie/arc.h Fri Jan 12 16:46:32 2001 +@@ -41,8 +41,8 @@ + } Arc; + + #ifndef HAVE_BUILTIN_ARC +-#define ARC_INIT_SCRIPT SYSCONFDIR "/ssocket/arcinit.cs" +-#define ARC_ENCRYPT_SCRIPT SYSCONFDIR "/ssocket/arcencrypt.cs" ++#define ARC_INIT_SCRIPT SYSCONFDIR "/mirrordir/arcinit.cs" ++#define ARC_ENCRYPT_SCRIPT SYSCONFDIR "/mirrordir/arcencrypt.cs" + #endif + + void arc_init (Arc * arc, unsigned char *key, int key_size); +diff -urN mirrordir-0.10.49-old/diffie/diffie-socket.h mirrordir-0.10.49/diffie/diffie-socket.h +--- mirrordir-0.10.49-old/diffie/diffie-socket.h Tue Nov 23 09:40:09 1999 ++++ mirrordir-0.10.49/diffie/diffie-socket.h Fri Jan 12 16:46:16 2001 +@@ -348,14 +348,14 @@ + + #else + +-#define SCRIPT_ACCEPT SYSCONFDIR "/ssocket/accept.cs" +-#define SCRIPT_CONNECT SYSCONFDIR "/ssocket/connect.cs" ++#define SCRIPT_ACCEPT SYSCONFDIR "/mirrordir/accept.cs" ++#define SCRIPT_CONNECT SYSCONFDIR "/mirrordir/connect.cs" + +-#define KEY_DIR SYSCONFDIR "/ssocket" +-#define PRIVATE_KEY_DIR SYSCONFDIR "/ssocket/private" +-#define PUBLIC_KEY_DIR SYSCONFDIR "/ssocket/public" +-#define PRIVATE_KEY_FILE SYSCONFDIR "/ssocket/private/%d" +-#define PUBLIC_KEY_FILE SYSCONFDIR "/ssocket/public/%d" ++#define KEY_DIR SYSCONFDIR "/mirrordir" ++#define PRIVATE_KEY_DIR SYSCONFDIR "/mirrordir/private" ++#define PUBLIC_KEY_DIR SYSCONFDIR "/mirrordir/public" ++#define PRIVATE_KEY_FILE SYSCONFDIR "/mirrordir/private/%d" ++#define PUBLIC_KEY_FILE SYSCONFDIR "/mirrordir/public/%d" + #define USER_KEY_DIR ".ssocket" + + #endif +diff -urN mirrordir-0.10.49-old/scripts/Makefile.in mirrordir-0.10.49/scripts/Makefile.in +--- mirrordir-0.10.49-old/scripts/Makefile.in Sun Jan 16 22:19:32 2000 ++++ mirrordir-0.10.49/scripts/Makefile.in Fri Jan 12 16:48:01 2001 +@@ -77,7 +77,7 @@ + system = @system@ + + sysconf_DATA = accept.cs connect.cs arcencrypt.cs arcinit.cs +-sysconfdir = ${prefix}/etc/ssocket ++sysconfdir = ${datadir}/mirrordir + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = ================================================================ Index: packages/mirrordir/mirrordir-zlib-1.1.3-zfree.patch diff -u /dev/null packages/mirrordir/mirrordir-zlib-1.1.3-zfree.patch:1.1 --- /dev/null Fri Nov 11 20:32:23 2011 +++ packages/mirrordir/mirrordir-zlib-1.1.3-zfree.patch Fri Nov 11 20:32:17 2011 @@ -0,0 +1,39 @@ +--- mirrordir/zlib.orig/infblock.c Mon Jun 8 19:06:16 1998 ++++ mirrordir/zlib/infblock.c Thu Feb 7 11:41:57 2002 +@@ -249,10 +249,11 @@ + &s->sub.trees.tb, s->hufts, z); + if (t != Z_OK) + { +- ZFREE(z, s->sub.trees.blens); + r = t; +- if (r == Z_DATA_ERROR) ++ if (r == Z_DATA_ERROR) { ++ ZFREE(z, s->sub.trees.blens); + s->mode = BAD; ++ } + LEAVE + } + s->sub.trees.index = 0; +@@ -313,11 +314,12 @@ + t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), + s->sub.trees.blens, &bl, &bd, &tl, &td, + s->hufts, z); +- ZFREE(z, s->sub.trees.blens); + if (t != Z_OK) + { +- if (t == (uInt)Z_DATA_ERROR) ++ if (t == (uInt)Z_DATA_ERROR) { ++ ZFREE(z, s->sub.trees.blens); + s->mode = BAD; ++ } + r = t; + LEAVE + } +@@ -329,6 +331,7 @@ + } + s->sub.decode.codes = c; + } ++ ZFREE(z, s->sub.trees.blens); + s->mode = CODES; + case CODES: + UPDATE ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mirrordir/mirrordir.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
