packages: poldek/poldek.spec, poldek/poldek-zlib.patch (NEW) - zlib fixes b...
arekm
arekm at pld-linux.org
Sun Feb 14 17:30:56 CET 2010
Author: arekm Date: Sun Feb 14 16:30:56 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- zlib fixes but still some issues not solved
---- Files affected:
packages/poldek:
poldek.spec (1.392 -> 1.393) , poldek-zlib.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.392 packages/poldek/poldek.spec:1.393
--- packages/poldek/poldek.spec:1.392 Thu Feb 4 22:38:36 2010
+++ packages/poldek/poldek.spec Sun Feb 14 17:30:51 2010
@@ -16,7 +16,7 @@
%define ver_rpm 4.5-5
#
%define snap 20080820.23
-%define rel 36
+%define rel 37
Summary: RPM packages management helper tool
Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM
Name: poldek
@@ -72,6 +72,7 @@
Patch32: %{name}-prepare_url_fix.patch
Patch33: %{name}-noloop_on_terminal_loos.patch
Patch34: %{name}-show_only_relative_used_space.patch
+Patch35: %{name}-zlib.patch
URL: http://poldek.pld-linux.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -239,12 +240,15 @@
%patch33 -p1
# do not info. about amount of transaction space req. but relative to already installed
%patch34 -p1
+# fixes failures with zlib >= 1.2.3.7
+%patch35 -p0
# cleanup backups after patching
find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
%build
%{__libtoolize}
+%{__autoheader}
%{__aclocal} -I m4
%{__autoconf}
%{__automake}
@@ -518,6 +522,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.393 2010/02/14 16:30:51 arekm
+- zlib fixes but still some issues not solved
+
Revision 1.392 2010/02/04 21:38:36 cactus
- patch32 - LP#506568
- patch33 - LP#499504
================================================================
Index: packages/poldek/poldek-zlib.patch
diff -u /dev/null packages/poldek/poldek-zlib.patch:1.1
--- /dev/null Sun Feb 14 17:30:56 2010
+++ packages/poldek/poldek-zlib.patch Sun Feb 14 17:30:51 2010
@@ -0,0 +1,131 @@
+? poldek-rpmlib.patch
+? x
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/poldek/poldek/configure.in,v
+retrieving revision 1.145
+retrieving revision 1.146
+diff -u -u -r1.145 -r1.146
+--- configure.in 12 May 2008 15:51:38 -0000 1.145
++++ configure.in 13 Feb 2010 22:00:08 -0000 1.146
+@@ -1,6 +1,6 @@
+
+ dnl Process this file with autoconf to produce a configure script.
+-dnl $Id$
++dnl $Id$
+
+ AC_INIT(poldek,0.30)
+ AC_CONFIG_SRCDIR([capreq.c])
+@@ -234,6 +234,8 @@
+ dnl Checks for libraries.
+ AC_CHECK_LIB(bz2, BZ2_bzCompress)
+ AC_CHECK_LIB(z, gzopen)
++
++AC_CHECK_FUNCS(gzungetc)
+
+ DBLIB=""
+ if test "${is_rpm4_0_4}." = "no." ; then
+Index: pkgdir/pkg_restore.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/pkgdir/pkg_restore.c,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -u -u -r1.25 -r1.26
+--- pkgdir/pkg_restore.c 25 May 2008 09:25:31 -0000 1.25
++++ pkgdir/pkg_restore.c 14 Feb 2010 16:10:26 -0000 1.26
+@@ -11,7 +11,7 @@
+ */
+
+ /*
+- $Id$
++ $Id$
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -149,7 +149,7 @@
+ struct pkg tmpkg;
+ off_t offs;
+ unsigned long ul_offs;
+- char linebuf[4096];
++ char linebuf[PATH_MAX];
+ int nerr = 0, nread, pkg_loaded = 0;
+ int tag, tag_binsize = PKG_STORETAG_SIZENIL;
+ const char *errmg_double_tag = "%s:%lu: double '%c' tag";
+Index: pkgdir/pdir/pdir.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/pkgdir/pdir/pdir.c,v
+retrieving revision 1.31
+retrieving revision 1.32
+diff -u -u -r1.31 -r1.32
+--- pkgdir/pdir/pdir.c 2 Feb 2008 21:49:04 -0000 1.31
++++ pkgdir/pdir/pdir.c 14 Feb 2010 16:10:26 -0000 1.32
+@@ -11,7 +11,7 @@
+ */
+
+ /*
+- $Id$
++ $Id$
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -577,7 +577,7 @@
+ int do_open(struct pkgdir *pkgdir, unsigned flags)
+ {
+ struct vfile *vf;
+- char linebuf[1024 * 256];
++ char linebuf[PATH_MAX];
+ int nline;
+ int nerr = 0, nread;
+ struct pkgroup_idx *pkgroups = NULL;
+Index: pkgdir/pdir/pdir_pkg_restore.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/pkgdir/pdir/pdir_pkg_restore.c,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -u -r1.11 -r1.12
+--- pkgdir/pdir/pdir_pkg_restore.c 25 May 2008 09:25:31 -0000 1.11
++++ pkgdir/pdir/pdir_pkg_restore.c 14 Feb 2010 16:10:26 -0000 1.12
+@@ -11,7 +11,7 @@
+ */
+
+ /*
+- $Id$
++ $Id$
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -135,7 +135,7 @@
+ {
+ struct pkgtags_s pkgt;
+ off_t offs;
+- char linebuf[4096];
++ char linebuf[PATH_MAX];
+ int nerr = 0, nread, with_pkg = 0;
+
+ const char *errmg_double_tag = "%s:%ld: double '%c' tag";
+Index: pkgdir/yum/yum.c
+===================================================================
+RCS file: /cvsroot/poldek/poldek/pkgdir/yum/yum.c,v
+retrieving revision 1.19
+retrieving revision 1.20
+diff -u -u -r1.19 -r1.20
+--- pkgdir/yum/yum.c 2 Feb 2008 21:49:05 -0000 1.19
++++ pkgdir/yum/yum.c 14 Feb 2010 16:10:26 -0000 1.20
+@@ -11,7 +11,7 @@
+ */
+
+ /*
+- $Id$
++ $Id$
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -128,7 +128,7 @@
+ int do_open(struct pkgdir *pkgdir, unsigned flags)
+ {
+ struct vfile *vf;
+- char linebuf[1024 * 16];
++ char linebuf[PATH_MAX];
+ int nline, nerr = 0, nread, n;
+ struct pkgroup_idx *pkgroups = NULL;
+ struct idx idx;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek.spec?r1=1.392&r2=1.393&f=u
More information about the pld-cvs-commit
mailing list