[CVS] RPM: rpm/ rpmpopt.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 11-Mar-2009 19:43:50
Branch: HEAD Handle: 2009031118434900
Modified files:
rpm rpmpopt.in
Log:
fix --orphandirs port alias ; add --danglinglink popt alias
Summary:
RevisionChanges Path
2.82+6 -2 rpm/rpmpopt.in
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
$ cvs diff -u -r2.81 -r2.82 rpmpopt.in
--- rpm/rpmpopt.in26 Jan 2009 18:29:47 - 2.81
+++ rpm/rpmpopt.in11 Mar 2009 18:43:49 - 2.82
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.81 2009/01/26 18:29:47 jbj Exp $
+# $Id: rpmpopt.in,v 2.82 2009/03/11 18:43:49 devzero2000 Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -65,8 +65,12 @@
--POPTdesc=$"list install/erase scriptlets (YAML markup)"
#==
+rpm alias --danglinglink --nofiles \
+ --pipe "set $(grep '^/' | sort -u) ; [ -L \"$1\" ] && echo \"$1\"
" \
+--POPTdesc=$"display link needed, but not provided, by packages"
+
rpm alias --orphandirs --nofiles \
- --pipe "grep '^/' | sort -u" \
+ --pipe "set $(grep '^/' | sort -u) ; [ -d \"$1\" ] && echo \"$1\"
" \
--POPTdesc=$"display directories needed, but not provided, by
packages"
rpm alias --setperms -q --qf '[\[ -L %{FILENAMES:shescape} \] || chmod
%7.7{FILEMODES:octal} %{FILENAMES:shescape}\n]' \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/misc/ Makefile.am librpmmisc.c mkdtemp.c t...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 17-Mar-2009 17:30:16 Branch: HEAD Handle: 2009031716301600 Added files: rpm/miscmkdtemp.c tempname.h Modified files: rpm CHANGES rpm/miscMakefile.am librpmmisc.c Log: add mkdtemp portability function to -lrpmmisc Summary: RevisionChanges Path 1.2827 +1 -0 rpm/CHANGES 1.42+4 -2 rpm/misc/Makefile.am 1.4 +4 -0 rpm/misc/librpmmisc.c 1.1 +349 -0 rpm/misc/mkdtemp.c 1.1 +38 -0 rpm/misc/tempname.h patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2826 -r1.2827 CHANGES --- rpm/CHANGES 16 Mar 2009 22:30:39 - 1.2826 +++ rpm/CHANGES 17 Mar 2009 16:30:16 - 1.2827 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: +- devzero2000: add mkdtemp portability function to -lrpmmisc - proyvind: do lazy mkdir of %_builddir, %_rpmdir & %_srcrpmdir when doing --install for src.rpms as well. - jbj: yarn: convert Header refcount to usage mutex. @@ . patch -p0 <<'@@ .' Index: rpm/misc/Makefile.am $ cvs diff -u -r1.41 -r1.42 Makefile.am --- rpm/misc/Makefile.am 15 Feb 2009 13:55:32 - 1.41 +++ rpm/misc/Makefile.am 17 Mar 2009 16:30:16 - 1.42 @@ -15,10 +15,12 @@ setenv.cstpcpy.cstpncpy.c \ strcspn.c strdup.cstrerror.c \ strftime.c strcspn.c strstr.cstrtol.c\ - strtoul.c + strtoul.c \ +tempname.h \ +mkdtemp.c noinst_HEADERS = \ - asprintf.h err.h error.h + asprintf.h err.h error.h tempname.h usrlibdir = $(libdir) usrlib_LTLIBRARIES = librpmmisc.la @@ . patch -p0 <<'@@ .' Index: rpm/misc/librpmmisc.c $ cvs diff -u -r1.3 -r1.4 librpmmisc.c --- rpm/misc/librpmmisc.c 31 Jul 2008 16:58:55 - 1.3 +++ rpm/misc/librpmmisc.c 17 Mar 2009 16:30:16 - 1.4 @@ -67,3 +67,7 @@ #if !defined(HAVE_STRSTR) #include "strstr.c" #endif + +#if !defined(HAVE_MKDTEMP) +#include "mkdtemp.c" +#endif @@ . patch -p0 <<'@@ .' Index: rpm/misc/mkdtemp.c $ cvs diff -u -r0 -r1.1 mkdtemp.c --- /dev/null 2009-03-17 17:30:15 +0100 +++ mkdtemp.c 2009-03-17 17:30:16 +0100 @@ -0,0 +1,349 @@ +/* Copyright (C) 1999, 2001-2003, 2006-2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +/* Extracted from misc/mkdtemp.c. */ +#include "system.h" + + +/* tempname.c - generate the name of a temporary file. + + Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001, 2002, 2003, 2005, 2006, 2007 Free Software Foundation, + Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License +
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 17-Mar-2009 18:29:50 Branch: HEAD Handle: 2009031717295000 Modified files: rpm CHANGES Log: Update CHANGES for Check-in Number: 11881 Summary: RevisionChanges Path 1.2828 +1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2827 -r1.2828 CHANGES --- rpm/CHANGES 17 Mar 2009 16:30:16 - 1.2827 +++ rpm/CHANGES 17 Mar 2009 17:29:50 - 1.2828 @@ -16,6 +16,7 @@ - jbj: delete ancient header+payload RSA signatures too using GPG (#488953). - jbj: rpmio: install rpmzlog.h and yarn.h, carry with rpmio.h. - jbj: rpmio: don't include glob.h. +- devzero2000: fix --orphandirs port alias ; add --danglinglink popt alias - proyvind: add support for cpuinfo() probe through libcpuinfo. - proyvind: perl: make sure to link against all required libraries to fix build with --no-undefined. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 23-Mar-2009 17:46:50 Branch: HEAD Handle: 2009032316465000 Modified files: rpm CHANGES configure.ac Log: Added AC_CPP_FUNC autofu portability macro Summary: RevisionChanges Path 1.2862 +1 -0 rpm/CHANGES 2.348 +32 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2861 -r1.2862 CHANGES --- rpm/CHANGES 21 Mar 2009 21:53:40 - 1.2861 +++ rpm/CHANGES 23 Mar 2009 16:46:50 - 1.2862 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: +- devzero2000: add autofu AC_CPP_FUNC portability macro - jbj: yarn: wire up rpmteFini, eliminate rpmteFree. - jbj: yarn: wire up rpmsxFini, eliminate rpmsxFree. - jbj: yarn: wire up rpmfiFini, eliminate rpmfiFree. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.347 -r2.348 configure.ac --- rpm/configure.ac 18 Mar 2009 17:12:22 - 2.347 +++ rpm/configure.ac 23 Mar 2009 16:46:50 - 2.348 @@ -109,6 +109,37 @@ AC_PROG_CPP AC_PROG_CXX +dnl Needed for the test support code; this was found at +dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html + +# AC_CPP_FUNC +# -- # +# Checks to see if ANSI C99 CPP variable __func__ works. +# If not, perhaps __FUNCTION__ works instead. +# If not, we'll just define __func__ to "". +AC_DEFUN([AC_CPP_FUNC], +[AC_REQUIRE([AC_PROG_CC_STDC])dnl +AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], +[[char *foo = __func__;]])], + [ac_cv_cpp_func=yes], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], +[[char *foo = __FUNCTION__;]])], + [ac_cv_cpp_func=__FUNCTION__], + [ac_cv_cpp_func=no])])]) +if test $ac_cv_cpp_func = __FUNCTION__; then + AC_DEFINE(__func__,__FUNCTION__, +[Define to __FUNCTION__ or "" if `__func__' does not conform to +ANSI C.]) +elif test $ac_cv_cpp_func = no; then + AC_DEFINE(__func__,"", +[Define to __FUNCTION__ or "" if `__func__' does not conform to +ANSI C.]) +fi +])# AC_CPP_FUNC + +AC_CPP_FUNC + AC_USE_SYSTEM_EXTENSIONS AC_PROG_AWK @@ -118,6 +149,7 @@ AC_PROG_LIBTOOL AC_PROG_YACC + AC_PATH_PROG(AS, as, as) dnl # GCC specifics @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES acinclude.m4 configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 23-Mar-2009 18:25:21 Branch: HEAD Handle: 2009032317252100 Modified files: rpm CHANGES acinclude.m4 configure.ac Log: fix: put AC_CPP_FUNC autofu macro in aclocal.m4 Summary: RevisionChanges Path 1.2863 +1 -0 rpm/CHANGES 2.25+31 -0 rpm/acinclude.m4 2.349 +0 -30 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2862 -r1.2863 CHANGES --- rpm/CHANGES 23 Mar 2009 16:46:50 - 1.2862 +++ rpm/CHANGES 23 Mar 2009 17:25:21 - 1.2863 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: +- devzero2000: fix: add autofu AC_CPP_FUNC portability macro in the acinclude.m4 - devzero2000: add autofu AC_CPP_FUNC portability macro - jbj: yarn: wire up rpmteFini, eliminate rpmteFree. - jbj: yarn: wire up rpmsxFini, eliminate rpmsxFree. @@ . patch -p0 <<'@@ .' Index: rpm/acinclude.m4 $ cvs diff -u -r2.24 -r2.25 acinclude.m4 --- rpm/acinclude.m4 25 May 2008 09:54:28 - 2.24 +++ rpm/acinclude.m4 23 Mar 2009 17:25:21 - 2.25 @@ -778,4 +778,35 @@ ]) fi ]) +dnl ## +dnl ## NAME: +dnl ##AC_CPP_FUNC +dnl ## +dnl ## Checks to see if ISO C99 CPP variable __func__ works. +dnl ## If not, perhaps __FUNCTION__ works instead. +dnl ## If not, we'll just define __func__ to "". +dnl ## +dnl ## Needed for the test support code; this was found at +dnl ## http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html +dnl +AC_DEFUN([AC_CPP_FUNC], +[AC_REQUIRE([AC_PROG_CC_STDC])dnl +AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], +[[char *foo = __func__;]])], + [ac_cv_cpp_func=yes], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], +[[char *foo = __FUNCTION__;]])], + [ac_cv_cpp_func=__FUNCTION__], + [ac_cv_cpp_func=no])])]) +if test $ac_cv_cpp_func = __FUNCTION__; then + AC_DEFINE(__func__,__FUNCTION__, +[Define to __FUNCTION__ or "" if `__func__' does not conform to +ANSI C.]) +elif test $ac_cv_cpp_func = no; then + AC_DEFINE(__func__,"", +[Define to __FUNCTION__ or "" if `__func__' does not conform to +ANSI C.]) +fi +])# AC_CPP_FUNC @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.348 -r2.349 configure.ac --- rpm/configure.ac 23 Mar 2009 16:46:50 - 2.348 +++ rpm/configure.ac 23 Mar 2009 17:25:21 - 2.349 @@ -108,36 +108,6 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_CXX - -dnl Needed for the test support code; this was found at -dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html - -# AC_CPP_FUNC -# -- # -# Checks to see if ANSI C99 CPP variable __func__ works. -# If not, perhaps __FUNCTION__ works instead. -# If not, we'll just define __func__ to "". -AC_DEFUN([AC_CPP_FUNC], -[AC_REQUIRE([AC_PROG_CC_STDC])dnl -AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], -[[char *foo = __func__;]])], - [ac_cv_cpp_func=yes], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], -[[char *foo = __FUNCTION__;]])], - [ac_cv_cpp_func=__FUNCTION__], - [ac_cv_cpp_func=no])])]) -if test $ac_cv_cpp_func = __FUNCTION__; then - AC_DEFINE(__func__,__FUNCTION__, -[Define to __FUNCTION__ or "" if `__func__' does not conform to -ANSI C.]) -elif test $ac_cv_cpp_func = no; then - AC_DEFINE(__func__,"", -[Define to __FUNCTION__ or "" if `__func__' does not conform to -ANSI C.]) -fi -])# AC_CPP_FUNC - AC_CPP_FUNC AC_USE_SYSTEM_EXTENSIONS @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ pack.c rpm/lib/ fsm.c psm.c rpmgi.c rpmluaext.c ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 26-Mar-2009 14:51:41
Branch: HEAD Handle: 2009032613513902
Modified files:
rpm rpmqv.c
rpm/build pack.c
rpm/lib fsm.c psm.c rpmgi.c rpmluaext.c rpmte.c tgi.c
tpgp.c
rpm/python rpmts-py.c
rpm/rpmdb header.c
rpm/rpmio iosm.c rpmtar.c
rpm/tools rpm2cpio.c rpmcache.c rpmmtree.c rpmrepo.c
Log:
begin change programming style for refcount : rpmtsFree and headerFree
Summary:
RevisionChanges Path
2.308 +4 -2 rpm/build/pack.c
2.182 +4 -2 rpm/lib/fsm.c
2.350 +4 -2 rpm/lib/psm.c
2.63+2 -1 rpm/lib/rpmgi.c
2.6 +4 -2 rpm/lib/rpmluaext.c
2.97+2 -1 rpm/lib/rpmte.c
2.21+2 -1 rpm/lib/tgi.c
2.20+2 -1 rpm/lib/tpgp.c
1.99+4 -2 rpm/python/rpmts-py.c
1.176 +4 -2 rpm/rpmdb/header.c
1.35+2 -1 rpm/rpmio/iosm.c
1.25+2 -1 rpm/rpmio/rpmtar.c
1.155 +4 -2 rpm/rpmqv.c
2.8 +2 -1 rpm/tools/rpm2cpio.c
2.35+2 -1 rpm/tools/rpmcache.c
2.5 +2 -1 rpm/tools/rpmmtree.c
2.18+2 -1 rpm/tools/rpmrepo.c
patch -p0 <<'@@ .'
Index: rpm/build/pack.c
$ cvs diff -u -r2.307 -r2.308 pack.c
--- rpm/build/pack.c 16 Mar 2009 21:06:44 - 2.307
+++ rpm/build/pack.c 26 Mar 2009 13:51:39 - 2.308
@@ -82,7 +82,8 @@
}
failedFile = _free(failedFile);
-ts = rpmtsFree(ts);
+(void)rpmtsFree(ts);
+ts=NULL;
return rc;
}
@@ -381,7 +382,8 @@
&spec->packages->header);
/*...@=mustmod@*/
- ts = rpmtsFree(ts);
+ (void)rpmtsFree(ts);
+ts=NULL;
if (sigs) *sigs = NULL; /* XXX HACK */
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
$ cvs diff -u -r2.181 -r2.182 fsm.c
--- rpm/lib/fsm.c 7 Mar 2009 13:38:09 - 2.181
+++ rpm/lib/fsm.c 26 Mar 2009 13:51:40 - 2.182
@@ -137,7 +137,8 @@
if (iter) {
iter->fi = rpmfiUnlink(iter->fi, "mapIterator");
/*...@-internalglobs@*/ /* XXX rpmswExit() */
- iter->ts = rpmtsFree(iter->ts);
+ (void)rpmtsFree(iter->ts);
+iter->ts=NULL;
/*...@=internalglobs@*/
}
return _free(p);
@@ -747,7 +748,8 @@
&fsm->op_digest);
fsm->lmtab = _free(fsm->lmtab);
-fsm->iter->ts = rpmtsFree(fsm->iter->ts);
+(void)rpmtsFree(fsm->iter->ts);
+fsm->iter->ts=NULL;
fsm->iter = mapFreeIterator(fsm->iter);
if (fsm->cfd != NULL) {
/*...@-refcounttrans@*/ /* FIX: XfdFree annotation */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.349 -r2.350 psm.c
--- rpm/lib/psm.c 21 Mar 2009 17:32:45 - 2.349
+++ rpm/lib/psm.c 26 Mar 2009 13:51:40 - 2.350
@@ -389,7 +389,8 @@
/* XXX nuke the added package(s). */
rpmtsClean(ts);
-psm->ts = rpmtsFree(psm->ts);
+(void)rpmtsFree(psm->ts);
+psm->ts=NULL;
return rpmrc;
}
@@ -1548,7 +1549,8 @@
psm->te = NULL;
#endif
/*...@-internalglobs@*/
-psm->ts = rpmtsFree(psm->ts);
+(void)rpmtsFree(psm->ts);
+psm->ts=NULL;
/*...@=internalglobs@*/
psm->sstates = _free(psm->sstates);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
$ cvs diff -u -r2.62 -r2.63 rpmgi.c
--- rpm/lib/rpmgi.c 21 Mar 2009 20:25:42 - 2.62
+++ rpm/lib/rpmgi.c 26 Mar 2009 13:51:40 - 2.63
@@ -474,7 +474,8 @@
}
gi->tsi = rpmtsiFree(gi->tsi);
gi->mi = rpmdbFreeIterator(gi->mi);
-gi->ts = rpmtsFree(gi->ts);
+(void)rpmtsFree(gi->ts);
+gi->ts=NULL;
}
/*...@unchecked@*/ /*...@null@*/
@@ .
patch -p0 <<'@@ .&
[CVS] RPM: rpm/build/ pack.c spec.c rpm/lib/ depends.c fsm.c package.c...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 26-Mar-2009 15:29:33 Branch: HEAD Handle: 2009032614292903 Modified files: rpm rpmqv.c rpm/build pack.c spec.c rpm/lib depends.c fsm.c package.c psm.c rpmchecksig.c rpmds.c rpmfi.c rpmgi.c rpminstall.c rpmluaext.c rpmrollback.c rpmte.c rpmts.c tgi.c tpgp.c transaction.c rpm/perlrpmxs.c rpm/python header-py.c rpmdb-py.c rpmts-py.c rpm/rpmdb hdrfmt.c pkgio.c rpmdb.c signature.c rpm/rpmio iosm.c rpmtar.c rpm/tools rpm2cpio.c rpmcache.c rpmmtree.c rpmrepo.c Log: continuing for refcount rewrite : add define of fooFree to rpmioFreePoolItem Summary: RevisionChanges Path 2.309 +4 -0 rpm/build/pack.c 2.197 +1 -0 rpm/build/spec.c 1.435 +1 -0 rpm/lib/depends.c 2.183 +3 -0 rpm/lib/fsm.c 2.207 +1 -0 rpm/lib/package.c 2.351 +4 -0 rpm/lib/psm.c 1.228 +1 -0 rpm/lib/rpmchecksig.c 2.138 +1 -0 rpm/lib/rpmds.c 2.142 +1 -0 rpm/lib/rpmfi.c 2.64+4 -0 rpm/lib/rpmgi.c 1.217 +1 -0 rpm/lib/rpminstall.c 2.7 +3 -0 rpm/lib/rpmluaext.c 1.41+1 -0 rpm/lib/rpmrollback.c 2.98+4 -0 rpm/lib/rpmte.c 2.165 +1 -0 rpm/lib/rpmts.c 2.22+3 -0 rpm/lib/tgi.c 2.21+3 -0 rpm/lib/tpgp.c 1.397 +2 -0 rpm/lib/transaction.c 1.11+1 -0 rpm/perl/rpmxs.c 1.104 +2 -0 rpm/python/header-py.c 1.23+1 -0 rpm/python/rpmdb-py.c 1.100 +2 -0 rpm/python/rpmts-py.c 1.131 +1 -0 rpm/rpmdb/hdrfmt.c 1.94+1 -0 rpm/rpmdb/pkgio.c 1.284 +1 -0 rpm/rpmdb/rpmdb.c 1.60+2 -0 rpm/rpmdb/signature.c 1.36+3 -0 rpm/rpmio/iosm.c 1.26+3 -0 rpm/rpmio/rpmtar.c 1.156 +3 -0 rpm/rpmqv.c 2.9 +3 -0 rpm/tools/rpm2cpio.c 2.36+4 -0 rpm/tools/rpmcache.c 2.6 +4 -0 rpm/tools/rpmmtree.c 2.19+4 -0 rpm/tools/rpmrepo.c patch -p0 <<'@@ .' Index: rpm/build/pack.c $ cvs diff -u -r2.308 -r2.309 pack.c --- rpm/build/pack.c 26 Mar 2009 13:51:39 - 2.308 +++ rpm/build/pack.c 26 Mar 2009 14:29:29 - 2.309 @@ -28,6 +28,10 @@ #include "debug.h" +#define rpmtsfree() rpmioFreePoolItem() +#define headerFree() rpmioFreePoolItem() + + /*...@access rpmts @*/ /*...@access rpmfi @*/ /* compared with NULL */ /*...@access Header @*/ /* compared with NULL */ @@ . patch -p0 <<'@@ .' Index: rpm/build/spec.c $ cvs diff -u -r2.196 -r2.197 spec.c --- rpm/build/spec.c 16 Sep 2008 06:46:04 - 2.196 +++ rpm/build/spec.c 26 Mar 2009 14:29:29 - 2.197 @@ -16,6 +16,7 @@ #include "rpmlua.h" #include "debug.h" +#define headerFree() rpmioFreePoolItem() /*...@-redecl@*/ extern int specedit; @@ . patch -p0 <<'@@ .' Index: rpm/lib/depends.c $ cvs diff -u -r1.434 -r1.435 depends.c --- rpm/lib/depends.c 21 Mar 2009 20:15:39 - 1.434 +++ rpm/lib/depends.c 26 Mar 2009 14:29:30 - 1.435 @@ -25,6 +25,7 @@ #include #include "debug.h" +#define headerFree() rpmioFreePoolItem() /*...@access tsortInfo @*/ /*...@access rpmte @*/ /* XXX for install <-> erase associate. */ @@ . patch -p0 <<'@@ .' Index: rpm/lib/fsm.c $ cvs diff -u -r2.182 -r2.183 fsm.c --- rpm/lib/fsm.c 26 Mar 2009 13:51:40 - 2.182 +++ rpm/lib/fsm.c 26 Mar 2009 14:29:30 - 2.183 @@ -34,6 +34,9 @@ #include "debug.h" +#define rpmtsfree() rpmioFreePoolItem() + + /*...@access FD_t @*//* XXX void
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 26-Mar-2009 15:51:20 Branch: HEAD Handle: 2009032614512000 Modified files: rpm CHANGES Log: update CHANGES for refcount programming rewrite Summary: RevisionChanges Path 1.2876 +2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2875 -r1.2876 CHANGES --- rpm/CHANGES 25 Mar 2009 20:26:46 - 1.2875 +++ rpm/CHANGES 26 Mar 2009 14:51:20 - 1.2876 @@ -1,5 +1,7 @@ 5.2a3 -> 5.2a4: +- devzero2000: continuing for refcount rewrite : add define of fooFree to rpmioFreePoolItem +- devzero2000: begin change programming style for refcount : rpmtsFree and headerFree - jbj: rpmio: rescusitate splint annotations. - jbj: getdate: ignore internalState changes. - jbj: poptIO: add --htdebug. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: file/ mkinstalldirs rpm/ acinclude.m4 configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm file Date: 07-Apr-2009 16:39:43
Branch: HEAD Handle: 2009040714394201
Modified files:
filemkinstalldirs
rpm acinclude.m4 configure.ac
Log:
devzero2000: Update autoconf version in AC_PREREQ in configure.ac - use the
same as in autoconf. Replace
via autoupdate the obsolete macros AC_TRY_RUN and AC_HELP_STRING. Do the
same on acinclude.m4.
Summary:
RevisionChanges Path
1.6 +34 -31 file/mkinstalldirs
2.26+1 -1 rpm/acinclude.m4
2.355 +9 -19 rpm/configure.ac
patch -p0 <<'@@ .'
Index: file/mkinstalldirs
$ cvs diff -u -r1.5 -r1.6 mkinstalldirs
--- file/mkinstalldirs25 May 2007 17:35:59 - 1.5
+++ file/mkinstalldirs7 Apr 2009 14:39:43 - 1.6
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
-scriptversion=2005-06-29.22
+scriptversion=2006-05-11.19
# Original author: Noah Friedman
# Created: 1993-05-16
@@ -11,6 +11,9 @@
# bugs to or send patches to
# .
+nl='
+'
+IFS=" "" $nl"
errstatus=0
dirmode=
@@ -25,12 +28,12 @@
# process command line arguments
while test $# -gt 0 ; do
case $1 in
- -h | --help | --h* )# -h for help
+-h | --help | --h*) # -h for help
echo "$usage"
exit $?
;;
- -m )# -m PERM arg
- shift
+-m) # -m PERM arg
+ shift
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
dirmode=$1
shift
@@ -50,7 +53,7 @@
*) # first non-opt arg
break
;;
- esac
+ esac
done
for file
@@ -63,7 +66,7 @@
done
case $# in
-0) exit 0 ;;
+ 0) exit 0 ;;
esac
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
@@ -73,10 +76,10 @@
# from a parallel make. We use --version in the probe to restrict
# ourselves to GNU mkdir, which is thread-safe.
case $dirmode in
-'')
+ '')
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-echo "mkdir -p -- $*"
-exec mkdir -p -- "$@"
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
@@ -86,11 +89,11 @@
test -d ./--version && rmdir ./--version
fi
;;
-*)
+ *)
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
test ! -d ./--version; then
-echo "mkdir -m $dirmode -p -- $*"
-exec mkdir -m "$dirmode" -p -- "$@"
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
else
# Clean up after NextStep and OpenStep mkdir.
for d in ./-m ./-p ./--version "./$dirmode";
@@ -110,40 +113,40 @@
oIFS=$IFS
IFS=/
set fnord $file
- shift
+ shift
IFS=$oIFS
- for d
- do
+ for d
+ do
test "x$d" = x && continue
pathcomp=$pathcomp$d
case $pathcomp in
- -* ) pathcomp=./$pathcomp ;;
- esac
+ -*) pathcomp=./$pathcomp ;;
+esac
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
+if test ! -d "$pathcomp"; then
+ echo "mkdir $pathcomp"
- mkdir "$pathcomp" || lasterr=$?
+ mkdir "$pathcomp" || lasterr=$?
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
-
[CVS] RPM: rpm/ CHANGES macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 17-Jun-2009 18:57:33
Branch: HEAD Handle: 2009061716573200
Modified files:
rpm CHANGES macros.in
Log:
add to macros.in _datarootdir and _lispdir for the new GNU coding standard.
Probably don't harm.
Summary:
RevisionChanges Path
1.3028 +1 -0 rpm/CHANGES
1.288 +7 -5 rpm/macros.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3027 -r1.3028 CHANGES
--- rpm/CHANGES 15 Jun 2009 20:42:02 - 1.3027
+++ rpm/CHANGES 17 Jun 2009 16:57:32 - 1.3028
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+- devzero2000: macros.in: add _datarootdir e _lispdir for GNU standard
- jbj: augtool: capture stdout in aut->iob, return through rpmaugRun().
- jbj: debugedit: handle DWARF-3 changes (#505774).
- jbj: augtool: use rpmaug globals where useful.
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
$ cvs diff -u -r1.287 -r1.288 macros.in
--- rpm/macros.in 31 May 2009 19:56:58 - 1.287
+++ rpm/macros.in 17 Jun 2009 16:57:32 - 1.288
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.287 2009/05/31 19:56:58 jbj Exp $
+# $Id: macros.in,v 1.288 2009/06/17 16:57:32 devzero2000 Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -1400,10 +1400,11 @@
#
%_prefix @prefix@
%_exec_prefix%{_prefix}
+%_datarootdir%{_prefix}/share
%_bindir %{_exec_prefix}/bin
%_sbindir%{_exec_prefix}/sbin
%_libexecdir %{_exec_prefix}/libexec
-%_datadir%{_prefix}/share
+%_datadir%{_datarootdir}
%_sysconfdir %{_prefix}/etc
%_sharedstatedir %{_prefix}/com
%_localstatedir %{_prefix}/var
@@ -1411,9 +1412,10 @@
%_libdir %{_exec_prefix}/%{_lib}
%_includedir %{_prefix}/include
%_oldincludedir /usr/include
-%_infodir%{_prefix}/info
-%_mandir %{_prefix}/man
-%_localedir %{_datadir}/locale
+%_infodir%{_datarootdir}/info
+%_mandir %{_datarootdir}/man
+%_localedir %{_datarootdir}/locale
+%_lispdir%{_datarootdir}/emacs/site-lisp
%_initrddir %{_sysconfdir}/rc.d/init.d
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ popt.pc.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 11-Aug-2009 15:32:58
Branch: HEAD Handle: 2009081113325800
Modified files:
poptpopt.pc.in
Log:
Drop -L from popt.pc : it cause problem - ref novelbz#529921
Summary:
RevisionChanges Path
1.2 +1 -1 popt/popt.pc.in
patch -p0 <<'@@ .'
Index: popt/popt.pc.in
$ cvs diff -u -r1.1 -r1.2 popt.pc.in
--- popt/popt.pc.in 25 Jul 2009 05:47:13 - 1.1
+++ popt/popt.pc.in 11 Aug 2009 13:32:58 - 1.2
@@ -6,5 +6,5 @@
Name: popt
Version: @VERSION@
Description: popt library.
-Libs: -L${libdir} -lpopt
+Libs: -lpopt
Cflags: -I${includedir}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ Makefile.am configure.ac popt.pc.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 12-Aug-2009 15:15:22
Branch: HEAD Handle: 2009081213152101
Modified files:
poptMakefile.am configure.ac popt.pc.in
Log:
fix (hope) portability problem in popt.pc
Summary:
RevisionChanges Path
1.53+1 -1 popt/Makefile.am
1.49+18 -1 popt/configure.ac
1.3 +1 -1 popt/popt.pc.in
patch -p0 <<'@@ .'
Index: popt/Makefile.am
$ cvs diff -u -r1.52 -r1.53 Makefile.am
--- popt/Makefile.am 26 Jul 2009 19:14:09 - 1.52
+++ popt/Makefile.am 12 Aug 2009 13:15:21 - 1.53
@@ -4,7 +4,7 @@
LINT = splint
-EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
+EXTRA_DIST = config.rpath config.rpath autogen.sh CHANGES $(man_MANS)
popt.spec \
footer_no_timestamp.html libpopt.vers \
testit.sh test-poptrc test3-data/0* \
po/*.in po/*.po po/popt.pot \
@@ .
patch -p0 <<'@@ .'
Index: popt/configure.ac
$ cvs diff -u -r1.48 -r1.49 configure.ac
--- popt/configure.ac 25 Jul 2009 05:47:13 - 1.48
+++ popt/configure.ac 12 Aug 2009 13:15:21 - 1.49
@@ -12,7 +12,7 @@
AC_SUBST(LT_REVISION, 0)
AC_SUBST(LT_AGE, 8)
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign -Wall])
ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru
sk sl sv th tr uk vi wa zh_TW zh_CN"
@@ -75,6 +75,23 @@
eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to
default POPT configuration directory])
+
+# Define a (hope) portable Libs pkgconfig directive that
+# - Don't harm if the default library search path include ${libdir}
+# (https://bugzilla.novell.com/show_bug.cgi?id=529921)
+# - Don't require a not upstream patch to pkgconfig
+# (https://bugs.freedesktop.org/show_bug.cgi?id=16095)
+popt_pkgconfig_libs='-L${libdir} -lpopt'
+case "${libdir}" in
+/usr/lib|/usr/lib64|/lib|/lib64)
+ popt_pkgconfig_libs='-lpopt'
+;;
+*)
+ popt_pkgconfig_libs='-L${libdir} -lpopt'
+;;
+esac
+AC_SUBST([POPT_PKGCONFIG_LIBS],"$popt_pkgconfig_libs")
+
POPT_SOURCE_PATH="`pwd`"
AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH",
[Full path to popt top_srcdir.])
@@ .
patch -p0 <<'@@ .'
Index: popt/popt.pc.in
$ cvs diff -u -r1.2 -r1.3 popt.pc.in
--- popt/popt.pc.in 11 Aug 2009 13:32:58 - 1.2
+++ popt/popt.pc.in 12 Aug 2009 13:15:22 - 1.3
@@ -6,5 +6,5 @@
Name: popt
Version: @VERSION@
Description: popt library.
-Libs: -lpopt
+Libs: @POPT_PKGCONFIG_LIBS@
Cflags: -I${includedir}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ Makefile.am configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 12-Aug-2009 16:29:40
Branch: HEAD Handle: 2009081214293900
Modified files:
poptMakefile.am configure.ac
Log:
Probably it is better to restrict the previous fix only for Linux
systems.
Summary:
RevisionChanges Path
1.54+1 -1 popt/Makefile.am
1.50+21 -7 popt/configure.ac
patch -p0 <<'@@ .'
Index: popt/Makefile.am
$ cvs diff -u -r1.53 -r1.54 Makefile.am
--- popt/Makefile.am 12 Aug 2009 13:15:21 - 1.53
+++ popt/Makefile.am 12 Aug 2009 14:29:39 - 1.54
@@ -4,7 +4,7 @@
LINT = splint
-EXTRA_DIST = config.rpath config.rpath autogen.sh CHANGES $(man_MANS)
popt.spec \
+EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \
footer_no_timestamp.html libpopt.vers \
testit.sh test-poptrc test3-data/0* \
po/*.in po/*.po po/popt.pot \
@@ .
patch -p0 <<'@@ .'
Index: popt/configure.ac
$ cvs diff -u -r1.49 -r1.50 configure.ac
--- popt/configure.ac 12 Aug 2009 13:15:21 - 1.49
+++ popt/configure.ac 12 Aug 2009 14:29:39 - 1.50
@@ -82,13 +82,27 @@
# - Don't require a not upstream patch to pkgconfig
# (https://bugs.freedesktop.org/show_bug.cgi?id=16095)
popt_pkgconfig_libs='-L${libdir} -lpopt'
-case "${libdir}" in
-/usr/lib|/usr/lib64|/lib|/lib64)
- popt_pkgconfig_libs='-lpopt'
-;;
-*)
- popt_pkgconfig_libs='-L${libdir} -lpopt'
-;;
+case "${host}" in
+*-*-linux*)
+ case "${libdir}" in
+ /usr/lib|/usr/lib64|/lib|/lib64)
+popt_pkgconfig_libs='-lpopt'
+ ;;
+ *)
+ popt_pkgconfig_libs='-L${libdir} -lpopt'
+ ;;
+ esac
+ ;;
+*-*-gnu*)
+ case "${libdir}" in
+ /usr/lib|/usr/lib64|/lib|/lib64)
+popt_pkgconfig_libs='-lpopt'
+ ;;
+ *)
+ popt_pkgconfig_libs='-L${libdir} -lpopt'
+ ;;
+ esac
+ ;;
esac
AC_SUBST([POPT_PKGCONFIG_LIBS],"$popt_pkgconfig_libs")
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES Makefile.am acinclude.m4 configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 13-Aug-2009 15:17:33 Branch: HEAD Handle: 2009081313173300 Modified files: poptCHANGES Makefile.am configure.ac Removed files: poptacinclude.m4 Log: add AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR to configure. del acinclude.m4 : AC_CHECK_VA_COPY is not used Summary: RevisionChanges Path 1.117 +2 -1 popt/CHANGES 1.55+1 -1 popt/Makefile.am 1.3 +0 -113popt/acinclude.m4 1.51+3 -0 popt/configure.ac patch -p0 <<'@@ .' Index: popt/CHANGES $ cvs diff -u -r1.116 -r1.117 CHANGES --- popt/CHANGES 26 Jul 2009 19:14:09 - 1.116 +++ popt/CHANGES 13 Aug 2009 13:17:33 - 1.117 @@ -8,7 +8,8 @@ - add POPT_ARG_SHORT handling. - handle all callback traversals within a C switch (for extendability ease). - add popt.pc. - +- devzero2000: add AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR to configure. Create build-aux +- devzero2000: del acinclude.m4 : AC_CHECK_VA_COPY is not used 1.14 -> 1.15: - release popt-1.15. - rse: fix building under --disable-nls @@ . patch -p0 <<'@@ .' Index: popt/Makefile.am $ cvs diff -u -r1.54 -r1.55 Makefile.am --- popt/Makefile.am 12 Aug 2009 14:29:39 - 1.54 +++ popt/Makefile.am 13 Aug 2009 13:17:33 - 1.55 @@ -4,7 +4,7 @@ LINT = splint -EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \ +EXTRA_DIST = build-aux/config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \ footer_no_timestamp.html libpopt.vers \ testit.sh test-poptrc test3-data/0* \ po/*.in po/*.po po/popt.pot \ @@ . rm -f popt/acinclude.m4 <<'@@ .' Index: popt/acinclude.m4 [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.50 -r1.51 configure.ac --- popt/configure.ac 12 Aug 2009 14:29:39 - 1.50 +++ popt/configure.ac 13 Aug 2009 13:17:33 - 1.51 @@ -12,7 +12,10 @@ AC_SUBST(LT_REVISION, 0) AC_SUBST(LT_AGE, 8) +dnl Must come before AM_INIT_AUTOMAKE. +AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign -Wall]) +AC_CONFIG_MACRO_DIR([m4]) ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES INSTALL.developer
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 24-Sep-2009 14:21:47 Branch: HEAD Handle: 2009092412214700 Added files: rpm INSTALL.developer Modified files: rpm CHANGES Log: add INSTALL.developer Summary: RevisionChanges Path 1.3130 +1 -0 rpm/CHANGES 1.1 +89 -0 rpm/INSTALL.developer patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3129 -r1.3130 CHANGES --- rpm/CHANGES 23 Sep 2009 13:09:44 - 1.3129 +++ rpm/CHANGES 24 Sep 2009 12:21:47 - 1.3130 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 +- devzero2000: add INSTALL.developer - jbj: order: fix: check current package for files/dirs before other packages. - jbj: order: fix: avoid self-looping for man-pages (and pkgs w no requires) - jbj: rpmdb: use DB_CONFIG. @@ . patch -p0 <<'@@ .' Index: rpm/INSTALL.developer $ cvs diff -u -r0 -r1.1 INSTALL.developer --- /dev/null 2009-09-24 14:15:25 +0200 +++ INSTALL.developer 2009-09-24 14:21:47 +0200 @@ -0,0 +1,89 @@ +These are brief notes for those are @rpm5.org developers or for who want +to try the latest RPM5 version under development. + +They were originally written by the Maintainer via private comunication, +but I thought might be useful to a wider audience. + +Any error or omission are of course only my fault. + +Elia + + ** + +Here's a quick and terse howto check-out and build RPM from CVS. + +Because of the number of configure parameters and the fact +that RPM uses external <-> internal copies of several +sources, the mechanism is a bit more complex than +just doing a cvs checkout and running ./autogen.sh + +0) Get the configgery in place (feel free to change to taste). + The transport is ssh with all the usual rulles. I tend + to add this "stuff" in ~/.bashrc + + export MALLOC_CHECK_=3 + # http://udrepper.livejournal.com/11429.html + export MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) + + # http://mah.everybody.org/docs/ssh + SSHAGENT="/usr/bin/ssh-agent" + + if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT -s` + trap "kill $SSH_AGENT_PID" 0 + fi + + and someplace I'm setting CVS_RSH=ssh. + +1) Get the sources. + I tend to use these cvs options in ~/.cvsrc (because I can never remeber): + $ cat ~/.cvsrc + cvs -q -z3 + diff-puw + rdiff -u + update -Pd + + A checkout of cvs HEAD then looks like this (I work in a "wdj" sandbox) + cvs -d :ext:rpm-cvs@rpm5.org:/v/rpm/cvs get -d wdj rpm + + Branch names look like "rpm-5_2", so the equivalent check out for rpm-5.2.x code is + cvs -d :ext:rpm-cvs@rpm5.org:/v/rpm/cvs get -d wdj52 -r rpm-5_2 rpm + + You can see all the tags any time you wish by doing + cd wdj # <-- top of checkout + cvs status -v INSTALL + +2) Use devtool to check out internal sources and configure: + + Examine devtool.conf (and feel free to add stanzas as you want). + + I build RPM using a maximally configured set of options like + ./devtool jbj + which checks out 4-5 other trees, and sets about running ./configure + + The other approach commonly used with devtool is the "standalone" + target. Ralf & Anders usually use that. I would likely be using "standalone" + too, just my RPM habits are peculier to me as a developer, there's lots that + is right with the "standalone" devtool target stanza. + +3) Type "make". + + On a clear day with a stiff wind, the make will succeed ;-) + + More seriously, most build breakage can be fixed by adjusting + AutoFu options passed to configure. + + Hint: Because of the complexity of RPM's configuration, there's + a few configuration dependencies that would be (imho) too painful + to track through Makefile's precisely. Specifically, watch out + for the misc/* "kitchen sink". The -lrpmmisc library is not always + rebuilt when the AutoFu changes. So one s
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 25-Sep-2009 12:16:31 Branch: HEAD Handle: 2009092510163100 Modified files: rpm Makefile.am Log: add INSTALL.developer in automake dist rule that i Summary: RevisionChanges Path 2.245 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.244 -r2.245 Makefile.am --- rpm/Makefile.am 23 Aug 2009 19:25:36 - 2.244 +++ rpm/Makefile.am 25 Sep 2009 10:16:31 - 2.245 @@ -5,7 +5,7 @@ LINT = splint MCCABE = pmccabe -EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL cpuinfo.yaml \ +EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL INSTALL.developer cpuinfo.yaml \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ db db3/configure xar xz pcre syck \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ rpm-genenerate-loop-test-harness.sh
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 25-Sep-2009 18:54:40
Branch: HEAD Handle: 2009092516543900
Added files:
rpm/tests rpm-genenerate-loop-test-harness.sh
Log:
add rpm-genenerate-loop-test-harness.sh
Summary:
RevisionChanges Path
1.1 +281 -0 rpm/tests/rpm-genenerate-loop-test-harness.sh
patch -p0 <<'@@ .'
Index: rpm/tests/rpm-genenerate-loop-test-harness.sh
$ cvs diff -u -r0 -r1.1 rpm-genenerate-loop-test-harness.sh
--- /dev/null 2009-09-25 18:54:39 +0200
+++ rpm-genenerate-loop-test-harness.sh 2009-09-25 18:54:40 +0200
@@ -0,0 +1,281 @@
+#!/bin/bash
+#
+##
+# Generate an rpm spec file for testing looping issue
+#
+# rpm-genenerate-loop-test-harness.sh -s -m -p
+#
+# Copyright (C) 2006 Elia Pinto (devzero2...@rpm5.org)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
by
+# The Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+##
+# OK: it is really a toy script, written in JAPH style
+# to generate pathological rpm loop dependencies
+##
+##
+# Useful (?) function
+##
+Die() {
+ echo "$_PROGNAME: ERROR: $@" >&2
+ exit 1
+}
+Info() {
+ echo "$_PROGNAME: INFO: $@" >&2
+}
+Warn() {
+ echo "$_PROGNAME: WARNING: $@" >&2
+}
+Usage() {
+ echo "Usage: $_PROGNAME -s -m -p
" >&2
+ exit 1
+}
+#
+# Argument Check
+#
+readonly _PROGNAME=${0##*/}
+while getopts "m:s:p:" opt; do
+ case "$opt" in
+ m) if [ -z "$_MAX_REQUIRES" ]
+then _MAX_REQUIRES=$OPTARG
+else
+ Usage
+fi;;
+ s) if [ -z "$_SPEC_FILE_NAME" ]
+then readonly _SPEC_FILE_NAME=$OPTARG
+else
+ Usage
+fi;;
+ p) if [ -z "$_COUNTPKG" ]
+then readonly _COUNTPKG=$OPTARG
+else
+ Usage
+fi;;
+ *) Usage;;
+\?) Usage;;
+ esac
+done
+[ -z "${_MAX_REQUIRES}" -o -z "$_SPEC_FILE_NAME" -o -z "$_COUNTPKG" ] &&
Usage
+
+readonly _PKGNAME=${_SPEC_FILE_NAME%%\.*}
+readonly _SPECFILE=${_PKGNAME}.spec
+
+[ -e ${_SPECFILE} ] && Die "${_SPECFILE} exists. Remove it first"
+
+
+
+# Hardcoded
+###
+readonly _VERSION=1.0
+readonly _RELEASE=1
+
+if [ ${_MAX_REQUIRES} -gt ${_COUNTPKG} ]
+then
+ _MAX_REQUIRES="${_COUNTPKG}"
+fi
+#readonly _MAX_REQUIRES
+
+cat < $_SPECFILE
+##
+# Created by ${_PROGNAME}
+# with
+# - max direct Requires: ${_MAX_REQUIRES}
+# - Number of Packages : ${_COUNTPKG}
+##
+Summary: Loop Ordering Test Harness
+Name: ${_PKGNAME}
+BuildArch: noarch
+Version: ${_VERSION}
+Release: ${_RELEASE}
+License: LGPLv3
+Group: Applications/System
+Buildroot: %{_tmppath}/%{name}-tmp
+URL: http://rpm5.org
+
+%description
+
+A toy loop rpm test harness.
+
+This package(s) generate pathological rpm loop dependencies
+
+For an example see rhbz#437041
+
+EOF
+
+#
+_c=1
+while [ $_c -le $_COUNTPKG ]
+do
+cat <> $_SPECFILE
+
+%package $_c
+Summary: $_PKGNAME-$_c
+Group: Applications/Security
+BuildArch: noarch
+EOF
+#
+count=1
+number=0
+oldnumber=0
+prec=0
+succ=0
+while [ "$count" -le ${_MAX_REQUIRES} ]
+do
+ number=$RANDOM
+ number_in_
[CVS] RPM: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 28-Sep-2009 16:38:50 Branch: HEAD Handle: 2009092814385000 Modified files: rpm CHANGES configure.ac Log: add -fno-delete-null-pointer-checks: http://patchwork.kernel.org/patch/36060/ Summary: RevisionChanges Path 1.3131 +1 -0 rpm/CHANGES 2.404 +9 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3130 -r1.3131 CHANGES --- rpm/CHANGES 24 Sep 2009 12:21:47 - 1.3130 +++ rpm/CHANGES 28 Sep 2009 14:38:50 - 1.3131 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 +- devzero2000: add rpm-genenerate-loop-test-harness.sh - devzero2000: add INSTALL.developer - jbj: order: fix: check current package for files/dirs before other packages. - jbj: order: fix: avoid self-looping for man-pages (and pkgs w no requires) @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.403 -r2.404 configure.ac --- rpm/configure.ac 19 Sep 2009 23:12:03 - 2.403 +++ rpm/configure.ac 28 Sep 2009 14:38:50 - 2.404 @@ -187,6 +187,15 @@ fi fi ]) +AC_ARG_ENABLE(build-optimization, +AS_HELP_STRING([--enable-build-optimization], [build RPM instrumented for extra optimization/security (GCC only)]), [dnl +if test ".$enableval" = .yes; then +if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then +dnl # GNU GCC (usually "gcc") +CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" +fi +fi +]) AC_ARG_ENABLE(build-gcov, AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for gcov]), [dnl if test ".$enableval" = .yes; then @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 28-Sep-2009 17:17:08 Branch: HEAD Handle: 2009092815170800 Modified files: rpm configure.ac Log: rework security CFLAGS without autofu. Add also some other Summary: RevisionChanges Path 2.405 +6 -9 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.404 -r2.405 configure.ac --- rpm/configure.ac 28 Sep 2009 14:38:50 - 2.404 +++ rpm/configure.ac 28 Sep 2009 15:17:08 - 2.405 @@ -187,15 +187,12 @@ fi fi ]) -AC_ARG_ENABLE(build-optimization, -AS_HELP_STRING([--enable-build-optimization], [build RPM instrumented for extra optimization/security (GCC only)]), [dnl -if test ".$enableval" = .yes; then -if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then -dnl # GNU GCC (usually "gcc") -CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" -fi -fi -]) +dnl # build RPM instrumented for extra optimization/security (GCC only) +dnl # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ +if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then +dnl # GNU GCC (usually "gcc") +CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector" +fi AC_ARG_ENABLE(build-gcov, AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for gcov]), [dnl if test ".$enableval" = .yes; then @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/local/ lposix.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: lua Date: 28-Sep-2009 18:06:11
Branch: HEAD Handle: 2009092816061100
Modified files:
lua/local lposix.c
Log:
add mkdtemp to lua posix extension: the glue is already in rpmmisc
Summary:
RevisionChanges Path
1.13+0 -4 lua/local/lposix.c
patch -p0 <<'@@ .'
Index: lua/local/lposix.c
$ cvs diff -u -r1.12 -r1.13 lposix.c
--- lua/local/lposix.c10 Nov 2008 20:48:59 - 1.12
+++ lua/local/lposix.c28 Sep 2009 16:06:11 - 1.13
@@ -538,7 +538,6 @@
return pushresult(L, mkdir(path, 0777), path);
}
-#ifdef NOTYET
static int Pmkdtemp(lua_State *L)/** mkdtemp(template) */
/*...@globals fileSystem @*/
/*...@modifies L, fileSystem @*/
@@ -556,7 +555,6 @@
return 1;
}
}
-#endif
static int Pchdir(lua_State *L) /** chdir(path) */
@@ -1230,9 +1228,7 @@
{"kill",Pkill},
{"link",Plink},
{"mkdir", Pmkdir},
-#ifdef NOTYET
{"mkdtemp", Pmkdtemp},
-#endif
{"mkfifo", Pmkfifo},
{"mkstemp", Pmkstemp},
{"pathconf",Ppathconf},
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 28-Sep-2009 18:46:47 Branch: HEAD Handle: 2009092816464700 Modified files: rpm configure.ac Log: drop -fstack for now. Really it is necessary to check their presence. TODO++ Summary: RevisionChanges Path 2.406 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.405 -r2.406 configure.ac --- rpm/configure.ac 28 Sep 2009 15:17:08 - 2.405 +++ rpm/configure.ac 28 Sep 2009 16:46:47 - 2.406 @@ -191,7 +191,7 @@ dnl # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then dnl # GNU GCC (usually "gcc") -CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector" +CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fexceptions" fi AC_ARG_ENABLE(build-gcov, AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for gcov]), [dnl @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 29-Sep-2009 19:26:30 Branch: HEAD Handle: 2009092917262900 Modified files: rpm CHANGES configure.ac Log: add security CFLAGS for GCC if supported Summary: RevisionChanges Path 1.3133 +1 -0 rpm/CHANGES 2.407 +12 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3132 -r1.3133 CHANGES --- rpm/CHANGES 29 Sep 2009 14:43:59 - 1.3132 +++ rpm/CHANGES 29 Sep 2009 17:26:29 - 1.3133 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 +- devzero2000: add security CFLAGS for GCC if supported - jbj: dbi: configure new indices with 4b join keys and duplicates. - jbj: dbi: generate additional indices. - jbj: dbi: add db->associate_foreign. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.406 -r2.407 configure.ac --- rpm/configure.ac 28 Sep 2009 16:46:47 - 2.406 +++ rpm/configure.ac 29 Sep 2009 17:26:29 - 2.407 @@ -191,7 +191,18 @@ dnl # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then dnl # GNU GCC (usually "gcc") -CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fexceptions" + for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions + do + my_save_cflags="$CFLAGS" + CFLAGS=$c + AC_MSG_CHECKING([whether GCC supports $c]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], +[AC_MSG_RESULT([yes])] +[my_cflags=$c], +[AC_MSG_RESULT([no])] + ) + CFLAGS="$my_save_cflags $my_cflags" + done fi AC_ARG_ENABLE(build-gcov, AS_HELP_STRING([--enable-build-gcov], [build RPM instrumented for gcov]), [dnl @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ gendiff
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 21-Oct-2009 18:26:00
Branch: HEAD Handle: 2009102116255900
Modified files:
rpm/scripts gendiff
Log:
drop gendiff checkbashisms complaint; use unipolar branches for
readability
Summary:
RevisionChanges Path
1.6 +8 -8 rpm/scripts/gendiff
patch -p0 <<'@@ .'
Index: rpm/scripts/gendiff
$ cvs diff -u -r1.5 -r1.6 gendiff
--- rpm/scripts/gendiff 25 Mar 2008 01:51:29 - 1.5
+++ rpm/scripts/gendiff 21 Oct 2009 16:25:59 - 1.6
@@ -1,22 +1,22 @@
#!/bin/sh
-function usage () {
+usage () {
echo "usage: $0 " 1>&2
exit 1
}
: ${DIFF:=diff -p}
-if [ "$1" = "-p" -a -z "$3" ];then
+[ "$1" = "-p" -a -z "$3" ] && {
echo "With -p you need to give the definition of patch (like dummy)"
exit 1
-fi
+}
-if [ "$1" = "-p" ];then
+[ "$1" = "-p" ] && {
DEFAULT_PATCH="$2"
shift;
- shift;
-fi
+shift;
+}
[ -z "$1" ] && usage
@@ -25,10 +25,10 @@
exit 1
}
-if [ -n "$DEFAULT_PATCH" -a "$RPM" ];then
+[ -n "$DEFAULT_PATCH" -a "$RPM" ] && {
FILEPATCH="$RPM/SOURCES/$(echo $1|sed 's@/@@g')-$DEFAULT_PATCH.patch"
[ -f $FILEPATCH ] && mv -f $FILEPATCH $FILEPATCH.old
-fi
+}
[ -n "$2" ] && PATCH_PREFIX=$2
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmfc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 18-Nov-2009 18:17:17
Branch: HEAD Handle: 2009111817171601
Modified files:
rpm CHANGES
rpm/lib rpmfc.c
Log:
fix hardwired docdir in rpmfc
Summary:
RevisionChanges Path
1.3161 +1 -0 rpm/CHANGES
1.68+7 -1 rpm/lib/rpmfc.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3160 -r1.3161 CHANGES
--- rpm/CHANGES 18 Nov 2009 15:00:25 - 1.3160
+++ rpm/CHANGES 18 Nov 2009 17:17:16 - 1.3161
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+- devzero2000: fix hardwired docdir in rpmfc
- proyvind: fix assert fail with Mandriva filetriggers in case of
installing src.rpm with no triggers queue. (from David Smid/Unity Linux)
- jbj: rpmmi: rework iterator instance filtering as a Bloom filter.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
$ cvs diff -u -r1.67 -r1.68 rpmfc.c
--- rpm/lib/rpmfc.c 27 Jun 2009 19:01:29 - 1.67
+++ rpm/lib/rpmfc.c 18 Nov 2009 17:17:17 - 1.68
@@ -740,6 +740,7 @@
int i;
int is_executable;
int xx;
+const char * defaultdocdir = NULL;
/* Extract dependencies only from files with executable bit set. */
{struct stat sb, * st = &sb;
@@ -812,7 +813,11 @@
(void) fclose(fp);
if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
- if (strncmp(fn, "/usr/share/doc/", sizeof("/usr/share/doc/")-1)) {
+ defaultdocdir = rpmExpand("%{?_defaultdocdir}", NULL);
+ if (defaultdocdir == NULL || *defaultdocdir == '\0')
+defaultdocdir = "/usr/share/doc";
+
+ if (strncmp(fn, defaultdocdir, sizeof(defaultdocdir)-1)) {
if (fc->fcolor->vals[fc->ix] & RPMFC_MODULE)
xx = rpmfcHelper(fc, 'P', "perl");
if (is_executable || (fc->fcolor->vals[fc->ix] & RPMFC_MODULE))
@@ -857,6 +862,7 @@
if (is_executable)
xx = rpmfcHelper(fc, 'R', "mono");
}
+defaultdocdir = _free(defaultdocdir) ;
return 0;
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/doc/manual/ Makefile.am newrpmdb.howto
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 20-Nov-2009 09:49:21 Branch: HEAD Handle: 2009112008492100 Added files: rpm/doc/manual newrpmdb.howto Modified files: rpm/doc/manual Makefile.am Log: add first version for newrpmdb.howto Summary: RevisionChanges Path 1.7 +2 -1 rpm/doc/manual/Makefile.am 1.1 +119 -0 rpm/doc/manual/newrpmdb.howto patch -p0 <<'@@ .' Index: rpm/doc/manual/Makefile.am $ cvs diff -u -r1.6 -r1.7 Makefile.am --- rpm/doc/manual/Makefile.am15 Jul 2008 22:13:06 - 1.6 +++ rpm/doc/manual/Makefile.am20 Nov 2009 08:49:21 - 1.7 @@ -16,4 +16,5 @@ signatures \ spec \ triggers \ - tsort + tsort \ +newrpmdb.howto @@ . patch -p0 <<'@@ .' Index: rpm/doc/manual/newrpmdb.howto $ cvs diff -u -r0 -r1.1 newrpmdb.howto --- /dev/null 2009-11-20 09:47:18 +0100 +++ newrpmdb.howto2009-11-20 09:49:21 +0100 @@ -0,0 +1,119 @@ +HOWTO NEW RPMDB IN RPM5 +=== + + + +First of all, there are known and significant rpmdb changes on HEAD. +So make a back up before doing anything else + cd /var/lib + tar czvf rpmdb-0.tar.gz ./rpm + +If you need to switch between HEAD -> older versions of RPM, +remove everything from /var/lib/rpm _EXCEPT_ Packages, install +rpm-5.1.9, and do a --rebuildb -vv. If that fails, restore +from the saved tarball. + +Now for a terse description of some things to watch out for. + +1) DB_CONFIG is used to configure Berkeley DB rather than macros. + + There's a rpmdb/DB_CONFIG file that is installed. There are + 3 lines that are important atm: + + set_thread_count64 + set_cachesize 0 1048576 0 + set_mp_mmapsize 16777216 + + The above captures all the Berkeley DB tunables that RPM has been using. + + (aside) + It turns out that there are some significant performance advantages + if you increase the last 2 lines to + set_cachesize 0 67108864 4 + set_mp_mmapsize 268435456 + See details at + https://bugzilla.redhat.com/show_bug.cgi?id=536818 + The configuration should apply to any recent version of Berkeley DB + used by RPM, with expected performance increases from using mmap(2) + rather than pread(2) for I/O. + +2) You can't just do "rm -rf /var/lib/rpm/__db*" to fix problems anymore. + + There's additional state in /var/lib/rpm that is needed for transactionally + protected ACID behavior, including: + Seqno this a database/table with a persistent header instance counter + log.* these are the transactional log files + One cannot remove Seqno without doing --rebuilddb, or the h# instances will go awry. + If you remove the log.* files, then you cannot open Packages. The simple + (to explain) fix is to install rpm-5.1.9, do --rebuilddb, then return to + HEAD to continue. + + There's another (more difficult to explain) fix to change from the transactional logging + model back to the concurrent access model and then doing --rebuilddb. + + Here is the older macro settings + %__dbi_cdb create cdb mpool mp_mmapsize=16Mb mp_size=1Mb thread_count=64 + and the newer + %__dbi_txn create lock log mpool txn auto_commit thread thread_count=64 + Note that the macro name has changed, and that mp_mmapsize mp_size are now set from + DB_CONFIG (the thread_count will end up in DB_CONFIG, but db-4.7.25 needs a patch) + + Other Berkeley DB configuration changes + 1) permitting duplicate keys + 2) attaching secondary indices to Packages + that is largely handled by these macros atm + %_bt_dupsortbt_dupsort index + %_h_dupsort h_dupsort index + I wouldn't advise changing those values, you will likely not be happy. + + But other than new state in Seqno and log.* files, well you can do + rm -f /var/lib/rpm/__db* + files whenever
[CVS] RPM: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 20-Nov-2009 14:46:16
Branch: HEAD Handle: 2009112013461500
Modified files:
rpm CHANGES configure.ac
Log:
don't permit configure option that produce unusable rpm5, see
http://rpm5.org/community/rpm-users/0346.html
Summary:
RevisionChanges Path
1.3164 +1 -0 rpm/CHANGES
2.410 +20 -0 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3163 -r1.3164 CHANGES
--- rpm/CHANGES 19 Nov 2009 20:19:33 - 1.3163
+++ rpm/CHANGES 20 Nov 2009 13:46:15 - 1.3164
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+- devzero2000: don't permit using b0rken configure option
- jbj: rpmdb: fix: ensure Seqno h# counter is initialized to 1 when
created.
- proyvind: add %distepoch back to provideversion, leave legacy
compatibility for adopters to care about.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.409 -r2.410 configure.ac
--- rpm/configure.ac 19 Nov 2009 00:34:21 - 2.409
+++ rpm/configure.ac 20 Nov 2009 13:46:15 - 2.410
@@ -1167,6 +1167,7 @@
[yes,external], [],
[], [AC_MSG_ERROR([mandatory POPT library not found])])
+HAVE_RPM_COMPRESSION=no
dnl # ZLib
RPM_CHECK_LIB(
[ZLib], [zlib],
@@ -1178,12 +1179,18 @@
fi
], [])
+if test ".$WITH_ZLIB" = .yes; then
+HAVE_RPM_COMPRESSION=yes
+fi
dnl # GNU BZip2
RPM_CHECK_LIB(
[GNU BZip2], [bzip2],
[bz2], [BZ2_bzread], [bzlib.h],
[no,external:none], [],
[], [])
+if test ".$WITH_BZIP2" = .yes; then
+HAVE_RPM_COMPRESSION=yes
+fi
dnl # libLZMA
WITH_XZ_INTERNAL=false
@@ -1196,13 +1203,22 @@
AC_DEFINE(HAVE_LZMA_H, 1, [Define to 1 if you have ])
fi
], [])
+if test ".$WITH_XZ" = .yes; then
+HAVE_RPM_COMPRESSION=yes
+fi
+if test ".$HAVE_RPM_COMPRESSION" = .no; then
+ AC_MSG_ERROR([you have passed --without-{xz,bzip2,zlib} together but
it isn't possible to build rpm without any form of compression library. At a
minimum, i suggest adding --with-zlib if you want to actually build and install
a *.rpm package])
+fi
dnl # BeeCrypt
RPM_CHECK_LIB(
[BeeCrypt], [beecrypt],
[beecrypt], [mpfprintln], [beecrypt/api.h],
[yes,external], [],
[], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ])
+if test ".$WITH_BEECRYPT" = .no; then
+ AC_MSG_ERROR([BEECRYPT is mandatory])
+fi
dnl # GCrypt
RPM_CHECK_LIB(
@@ -1572,6 +1588,10 @@
WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_PCRE"
fi
], [])
+dnl # check PCRE
+if test ".$WITH_PCRE" = .no; then
+ AC_MSG_ERROR([PCRE is mandatory. If you don't have libpcre then
--with-pcre=internal could be used])
+fi
dnl # OSSP uuid
RPM_CHECK_LIB(
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/js/ rpmte-js.c rpm/lib/ rpmgi.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 27-Nov-2009 15:29:06
Branch: HEAD Handle: 2009112714290401
Modified files:
rpm CHANGES
rpm/js rpmte-js.c
rpm/lib rpmgi.c
Log:
complete changing db2offset data type to uint32_t everywhere
Summary:
RevisionChanges Path
1.3167 +1 -0 rpm/CHANGES
1.12+1 -1 rpm/js/rpmte-js.c
2.70+1 -1 rpm/lib/rpmgi.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3166 -r1.3167 CHANGES
--- rpm/CHANGES 26 Nov 2009 14:12:53 - 1.3166
+++ rpm/CHANGES 27 Nov 2009 14:29:04 - 1.3167
@@ -1,5 +1,6 @@
5.2b1 -> 5.3a1
+- devzero2000: complete changing db2offset data type to uint32_t
everywhere
- bero: Fix generation of configure script with autoconf 2.65
- jbj: rpmdb: don't recurse within dbiFindByLabel.
- jbj: rpmdb: use PCRE patterns on Name index for package queries.
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmte-js.c
$ cvs diff -u -r1.11 -r1.12 rpmte-js.c
--- rpm/js/rpmte-js.c 7 Jul 2009 18:53:50 - 1.11
+++ rpm/js/rpmte-js.c 27 Nov 2009 14:29:05 - 1.12
@@ -309,7 +309,7 @@
rpmElementType etype = TR_ADDED;
fnpyKey key = NULL;
rpmRelocation relocs = NULL;
-int dboffset = 0;
+uint32_t dboffset = 0;
alKey pkgKey = NULL;
if (hdro != NULL) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
$ cvs diff -u -r2.69 -r2.70 rpmgi.c
--- rpm/lib/rpmgi.c 1 Jun 2009 20:37:23 - 2.69
+++ rpm/lib/rpmgi.c 27 Nov 2009 14:29:05 - 2.70
@@ -730,7 +730,7 @@
/* XXX rpmgi hack: Save header in transaction element. */
if (gi->flags & RPMGI_ERASING) {
static int hdrx = 0;
- int dboffset = headerGetInstance(gi->h);
+ uint32_t dboffset = headerGetInstance(gi->h);
if (dboffset <= 0)
dboffset = --hdrx;
xx = rpmtsAddEraseElement(gi->ts, gi->h, dboffset);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ .cvsignore .gitignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 27-Nov-2009 17:07:05 Branch: HEAD Handle: 2009112716070400 Added files: rpm .gitignore Modified files: rpm .cvsignore Log: update .cvsignore ; add .gitignore Summary: RevisionChanges Path 1.39+2 -0 rpm/.cvsignore 1.1 +53 -0 rpm/.gitignore patch -p0 <<'@@ .' Index: rpm/.cvsignore $ cvs diff -u -r1.38 -r1.39 .cvsignore --- rpm/.cvsignore24 Jul 2007 07:46:24 - 1.38 +++ rpm/.cvsignore27 Nov 2009 16:07:04 - 1.39 @@ -50,3 +50,5 @@ stamp-h* rpm-*.tar.gz ylwrap +.git +.gitignore @@ . patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2009-11-27 17:07:05 +0100 +++ .gitignore2009-11-27 17:07:04 +0100 @@ -0,0 +1,53 @@ +.deps +.depend +.depend-done +.libs +.devtool +ABOUT-NLS +Doxyfile +Doxytags +Makefile +Makefile.in +aclocal.m4 +autom4te* +apidocs +compile +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.site +config.status +config.sub +configure +depcomp +doxygen +find-requires +find-provides +install-sh +intl +lib-rpmrc +libtool +ltconfig +ltmain.sh +m4 +macros +macros-* +missing +mkinstalldirs +platform +rpm +rpm.spec +rpmbuild +rpmdb +rpm[a-z] +rpm2cpio +rpmconvert +rpmpopt* +rpmrc +stamp-h* +rpm-*.tar.gz +ylwrap +CVS @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ brp-implant-ident-static brp-java-repack-jars ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 09-Dec-2009 16:00:27
Branch: HEAD Handle: 2009120915002700
Modified files:
rpm/scripts brp-implant-ident-static brp-java-repack-jars
java.prov.sh java.req.sh javadeps.sh
Log:
get ride of some useless bashism: probably doesn't harm
Summary:
RevisionChanges Path
1.2 +3 -2 rpm/scripts/brp-implant-ident-static
1.2 +7 -5 rpm/scripts/brp-java-repack-jars
1.3 +3 -2 rpm/scripts/java.prov.sh
1.3 +3 -2 rpm/scripts/java.req.sh
1.3 +6 -4 rpm/scripts/javadeps.sh
patch -p0 <<'@@ .'
Index: rpm/scripts/brp-implant-ident-static
$ cvs diff -u -r1.1 -r1.2 brp-implant-ident-static
--- rpm/scripts/brp-implant-ident-static 20 Jun 2007 16:56:47 -
1.1
+++ rpm/scripts/brp-implant-ident-static 9 Dec 2009 15:00:27 -
1.2
@@ -17,7 +17,8 @@
trap cleanup 0 1 2 3 4 5 6 7 8 9 11 13 14 15
for library in `find $RPM_BUILD_ROOT -type f -exec file \{\} \; | grep
'current ar archive' | sed 's,:.*,,g' ` ; do
- pushd $tempdir > /dev/null
+PUSHDIR=`pwd`
+ cd $tempdir > /dev/null
if test -n "$RPM_BUILD_ROOT" ; then
cleanedlibrary=`echo "$library" | sed s,"$RPM_BUILD_ROOT",,g`
else
@@ -30,5 +31,5 @@
ar r "$library" "$object"
done
rm -f *.o
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
done
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/brp-java-repack-jars
$ cvs diff -u -r1.1 -r1.2 brp-java-repack-jars
--- rpm/scripts/brp-java-repack-jars 20 Jun 2007 16:56:47 - 1.1
+++ rpm/scripts/brp-java-repack-jars 9 Dec 2009 15:00:27 - 1.2
@@ -30,8 +30,9 @@
TMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp
$JARNAME.tmpdir.XX` || exit 1
JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp
$JARNAME.jardir.XX` || exit 1
TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp
$JARNAME.timeref.XX` || exit 1
-
- pushd $TMPDIR > /dev/null
+
+PUSHDIR=`pwd`
+ cd $TMPDIR > /dev/null
/usr/bin/unzip -qq -o $j
rm -f $j
@@ -66,13 +67,14 @@
cp $f $JARDIR/$f
touch --date="$DATE" $JARDIR/$f
done
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
# Set the times of the directories.
touch --date="$DATE" `find $JARDIR -type d`
# make the jar
- pushd $JARDIR > /dev/null
+PUSHDIR=`pwd`
+ cd $JARDIR > /dev/null
if [ -n "`find -type f`" ]; then
find -type f -print | LC_ALL=C sort | /usr/bin/zip -q
-X -9 $j -@
@@ -80,7 +82,7 @@
# Put the empty jar back
touch $j
fi
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
# Cleanup.
rm -rf $TMPDIR
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/java.prov.sh
$ cvs diff -u -r1.2 -r1.3 java.prov.sh
--- rpm/scripts/java.prov.sh 25 May 2007 18:34:16 - 1.2
+++ rpm/scripts/java.prov.sh 9 Dec 2009 15:00:27 - 1.3
@@ -42,9 +42,10 @@
;;
*.jar)
if ! $JAR tf "$filename" | grep -q -e '(^..|^/|^\\)' ; then
- pushd $classdir > /dev/null
+PUSHDIR=`pwd`
+ cd $classdir > /dev/null
$JAR xf "$filename"
- popd > /dev/null
+ cd $PUSHDIR > /dev/null
$JAR tf "$filename" | sed "s|^|$classdir/|g" | $0 "$@"
rm -fr $classdir/*
fi
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/java.req.sh
=
[CVS] RPM: rpm/lib/ rpminstall.c tgi.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 09-Dec-2009 17:02:44
Branch: HEAD Handle: 2009120916024400
Modified files:
rpm/lib rpminstall.c tgi.c
Log:
try to use rpmmiInstance consistently with uint32_t for the return
data type and hdrNum.
Summary:
RevisionChanges Path
1.222 +2 -2 rpm/lib/rpminstall.c
2.27+2 -2 rpm/lib/tgi.c
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
$ cvs diff -u -r1.221 -r1.222 rpminstall.c
--- rpm/lib/rpminstall.c 8 Dec 2009 13:25:05 - 1.221
+++ rpm/lib/rpminstall.c 9 Dec 2009 16:02:44 - 1.222
@@ -343,9 +343,9 @@
return RPMRC_NOTFOUND;
while ((h = rpmmiNext(mi)) != NULL) {
- unsigned int recOffset = rpmmiInstance(mi);
+ uint32_t hdrNum = rpmmiInstance(mi);
- if (recOffset == 0) { /* XXX can't happen. */
+ if (hdrNum == 0) { /* XXX can't happen. */
rc = RPMRC_FAIL;
break;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/tgi.c
$ cvs diff -u -r2.26 -r2.27 tgi.c
--- rpm/lib/tgi.c 15 May 2009 13:40:58 - 2.26
+++ rpm/lib/tgi.c 9 Dec 2009 16:02:44 - 2.27
@@ -59,9 +59,9 @@
return RPMRC_NOTFOUND;
while ((h = rpmmiNext(mi)) != NULL) {
- unsigned int recOffset = rpmmiInstance(mi);
+ uint32_t hdrNum = rpmmiInstance(mi);
- if (recOffset == 0) { /* XXX can't happen. */
+ if (hdrNum == 0) { /* XXX can't happen. */
rc = RPMRC_FAIL;
break;
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmgi.c verify.c rpm/rpmdb/ rpmdb.c rpm/tools/ rpm...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 10-Dec-2009 10:53:45
Branch: HEAD Handle: 2009121009534400
Modified files:
rpm/lib rpmgi.c verify.c
rpm/rpmdb rpmdb.c
rpm/tools rpmrepo.c
Log:
try to use headerGetInstance consistently with rpmuint32_t for the
return data type and hdrNum.
Summary:
RevisionChanges Path
2.71+4 -4 rpm/lib/rpmgi.c
2.198 +3 -3 rpm/lib/verify.c
1.356 +2 -2 rpm/rpmdb/rpmdb.c
2.23+1 -1 rpm/tools/rpmrepo.c
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
$ cvs diff -u -r2.70 -r2.71 rpmgi.c
--- rpm/lib/rpmgi.c 27 Nov 2009 14:29:05 - 2.70
+++ rpm/lib/rpmgi.c 10 Dec 2009 09:53:44 - 2.71
@@ -730,10 +730,10 @@
/* XXX rpmgi hack: Save header in transaction element. */
if (gi->flags & RPMGI_ERASING) {
static int hdrx = 0;
- uint32_t dboffset = headerGetInstance(gi->h);
- if (dboffset <= 0)
- dboffset = --hdrx;
- xx = rpmtsAddEraseElement(gi->ts, gi->h, dboffset);
+ rpmuint32_t hdrNum = headerGetInstance(gi->h);
+ if (hdrNum <= 0)
+ hdrNum = --hdrx;
+ xx = rpmtsAddEraseElement(gi->ts, gi->h, hdrNum);
} else
xx = rpmtsAddInstallElement(gi->ts, gi->h, (fnpyKey)gi->hdrPath, 2,
NULL);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/verify.c
$ cvs diff -u -r2.197 -r2.198 verify.c
--- rpm/lib/verify.c 29 Aug 2009 18:51:14 - 2.197
+++ rpm/lib/verify.c 10 Dec 2009 09:53:44 - 2.198
@@ -395,7 +395,7 @@
/*...@modifies ts, h, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
#ifdef NOTYET
-int instance = headerGetInstance(h);
+rpmuint32_t hdrNum = headerGetInstance(h);
#endif
rpmps ps;
int rc = 0; /* assume no problems */
@@ -403,8 +403,8 @@
rpmtsEmpty(ts);
#ifdef NOTYET
-if (instance > 0)
- (void) rpmtsAddEraseElement(ts, h, instance);
+if (hdrNum > 0)
+ (void) rpmtsAddEraseElement(ts, h, hdrNum);
else
#endif
(void) rpmtsAddInstallElement(ts, h, NULL, 0, NULL);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
$ cvs diff -u -r1.355 -r1.356 rpmdb.c
--- rpm/rpmdb/rpmdb.c 9 Dec 2009 21:40:20 - 1.355
+++ rpm/rpmdb/rpmdb.c 10 Dec 2009 09:53:44 - 1.356
@@ -2775,7 +2775,7 @@
sigset_t signalMask;
dbiIndex dbi;
size_t dbix;
-uint32_t hdrNum = headerGetInstance(h);
+rpmuint32_t hdrNum = headerGetInstance(h);
int ret = 0;
int xx;
@@ -3404,7 +3404,7 @@
(void) rpmmiSetHdrChk(mi, ts);
while ((h = rpmmiNext(mi)) != NULL) {
- uint32_t hdrNum = headerGetInstance(h);
+ rpmuint32_t hdrNum = headerGetInstance(h);
/* XXX ensure that the header instance is set persistently. */
assert(hdrNum > 0 && hdrNum == rpmmiInstance(mi));
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmrepo.c
$ cvs diff -u -r2.22 -r2.23 rpmrepo.c
--- rpm/tools/rpmrepo.c 3 Jul 2009 18:11:08 - 2.22
+++ rpm/tools/rpmrepo.c 10 Dec 2009 09:53:44 - 2.23
@@ -1133,7 +1133,7 @@
if (nsubs > 0) {
char instance[64];
int xx = snprintf(instance, sizeof(instance), "'%u'",
- (unsigned) headerGetInstance(h));
+ (rpmuint32_t) headerGetInstance(h));
size_t tlen = strlen(s) + nsubs * ((int)strlen(instance) - (int)nmark);
char * t = xmalloc(tlen + 1);
char * te = t;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ verify.c rpm/rpmdb/ rpmdb.c rpm/tools/ rpmrepo.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 11-Dec-2009 10:11:27
Branch: HEAD Handle: 2009121109112601
Modified files:
rpm/lib verify.c
rpm/rpmdb rpmdb.c
rpm/tools rpmrepo.c
Log:
partially revert previous commit for normalize headerGetInstance
return data type. It need more work for do it right
Summary:
RevisionChanges Path
2.200 +1 -1 rpm/lib/verify.c
1.358 +2 -2 rpm/rpmdb/rpmdb.c
2.24+1 -1 rpm/tools/rpmrepo.c
patch -p0 <<'@@ .'
Index: rpm/lib/verify.c
$ cvs diff -u -r2.199 -r2.200 verify.c
--- rpm/lib/verify.c 10 Dec 2009 18:52:18 - 2.199
+++ rpm/lib/verify.c 11 Dec 2009 09:11:26 - 2.200
@@ -399,7 +399,7 @@
/*...@modifies ts, h, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
#ifdef NOTYET
-rpmuint32_t hdrNum = headerGetInstance(h);
+uint32_t hdrNum = headerGetInstance(h);
#endif
rpmps ps;
int rc = 0; /* assume no problems */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
$ cvs diff -u -r1.357 -r1.358 rpmdb.c
--- rpm/rpmdb/rpmdb.c 10 Dec 2009 17:08:42 - 1.357
+++ rpm/rpmdb/rpmdb.c 11 Dec 2009 09:11:27 - 1.358
@@ -2794,7 +2794,7 @@
sigset_t signalMask;
dbiIndex dbi;
size_t dbix;
-rpmuint32_t hdrNum = headerGetInstance(h);
+uint32_t hdrNum = headerGetInstance(h);
int ret = 0;
int xx;
@@ -3423,7 +3423,7 @@
(void) rpmmiSetHdrChk(mi, ts);
while ((h = rpmmiNext(mi)) != NULL) {
- rpmuint32_t hdrNum = headerGetInstance(h);
+ uint32_t hdrNum = headerGetInstance(h);
/* XXX ensure that the header instance is set persistently. */
assert(hdrNum > 0 && hdrNum == rpmmiInstance(mi));
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmrepo.c
$ cvs diff -u -r2.23 -r2.24 rpmrepo.c
--- rpm/tools/rpmrepo.c 10 Dec 2009 09:53:44 - 2.23
+++ rpm/tools/rpmrepo.c 11 Dec 2009 09:11:27 - 2.24
@@ -1133,7 +1133,7 @@
if (nsubs > 0) {
char instance[64];
int xx = snprintf(instance, sizeof(instance), "'%u'",
- (rpmuint32_t) headerGetInstance(h));
+ (uint32_t) headerGetInstance(h));
size_t tlen = strlen(s) + nsubs * ((int)strlen(instance) - (int)nmark);
char * t = xmalloc(tlen + 1);
char * te = t;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ Makefile.am simplestRPMv3-1.0-2.aix5.3.noarch.rp...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 23-Feb-2010 18:16:03
Branch: HEAD Handle: 2010022317160300
Added files:
rpm/tests simplestRPMv3-1.0-2.aix5.3.noarch.rpm
Modified files:
rpm/tests Makefile.am
Log:
added a simplest toy rpm 3.0.5 aix 5.3 package
The test included should be work with rpm5 as the package
is not signed. But dunno if it is usefull or not
Summary:
RevisionChanges Path
1.62+5 -1 rpm/tests/Makefile.am
1.1 BLOBrpm/tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
$ cvs diff -u -r1.61 -r1.62 Makefile.am
--- rpm/tests/Makefile.am 31 Jan 2010 23:03:08 - 1.61
+++ rpm/tests/Makefile.am 23 Feb 2010 17:16:03 - 1.62
@@ -386,6 +386,10 @@
@${rpm} -qa --qf '[%{FILENAMES}: %{FILEREQUIRE}\n]' > /dev/null
@${rpm} -qa --qf '[%{FSNAMES}: %{FSSIZES}\n]' > /dev/null
+check-rpmv3:
+ @echo "=== $@ ==="
+ @${rpm} -qlp simplestRPMv3-1.0-2.aix5.3.noarch.rpm
+
check-verify:
@echo "=== $@ ==="
@${rpm} -e probes devtool-sanity
@@ -411,7 +415,7 @@
check-local: check-init check-pubkeys check-markup check-macros \
check-build check-sign check-ACID check-install \
- check-query check-verify \
+ check-query check-verify check-rpmv3\
check-triggers # check-tools # check-repo
clean-local:
@@ .
(cd rpm/tests && \
uudecode <<'@@ .' && \
xdelta patch simplestRPMv3-1.0-2.aix5.3.noarch.rpm.xdelta /dev/null
simplestRPMv3-1.0-2.aix5.3.noarch.rpm && \
rm -f simplestRPMv3-1.0-2.aix5.3.noarch.rpm.xdelta)
Index: rpm/tests/simplestRPMv3-1.0-2.aix5.3.noarch.rpm
begin 664 simplestRPMv3-1.0-2.aix5.3.noarch.rpm.xdelta
M)5A$6C`P-"4(`!$`$`!S:&EE;&$N.34P.3`N
M;G5L;'-H:65L82XY-3`Y,"YA;&p...@#`p```!^+"```
M``-C8&a...@9f!@\...@bvw.sgv$3r\l&SAEO?CC5`<48`(Z3P[(<
)52581%HP,#0E
`
end
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 26-Feb-2010 18:09:19
Branch: HEAD Handle: 2010022617091900
Modified files:
rpm/build files.c
Log:
Using in the spec file in the section %dir constructs such as
%dir directory/* is possible on some operating systems to overcome
the limits on the size of the program arg list.
The difference between operating systems release
could lead a packager to believe that the problem
is in the version of rpm when in fact it is not true. Look at the
package asterisk-1.6.2.2-1.fc13.src.rpm for an example of
this error.
Maybe the patch is too intrusive or requires some verification
further or is simply a crazy idea.
Summary:
RevisionChanges Path
1.365 +13 -3 rpm/build/files.c
patch -p0 <<'@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.364 -r1.365 files.c
--- rpm/build/files.c 10 Feb 2010 22:57:42 - 1.364
+++ rpm/build/files.c 26 Feb 2010 17:09:19 - 1.365
@@ -1067,10 +1067,20 @@
fl->passedSpecialDoc = 1;
fl->isSpecialDoc = 1;
}
-
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "cp -pr ", 0);
+/* XXX : prevent almost all case of arg list too long messages
+ the japh shell is equivalent to (x = specialDocBuf y =$DOCDIR )
+( [ -d x ] && cp -pr x y ; ) || find x 2>/dev/null | xargs -t
-n10 -I '{}' mv -f {} y 2>/dev/null
+*/
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "( [ -d '", 0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "' ] && cp -pr ",
0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "; ) || find ", 0);
pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 1);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " 2>/dev/null |
xargs -n10 -I '{}' mv -f {} ", 0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 0);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " 2>/dev/null", 1);
}
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 26-Feb-2010 18:11:51 Branch: HEAD Handle: 2010022617115000 Modified files: rpm CHANGES Log: forget to update CHANGES with the crazy idea Summary: RevisionChanges Path 1.3274 +2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3273 -r1.3274 CHANGES --- rpm/CHANGES 21 Feb 2010 20:52:34 - 1.3273 +++ rpm/CHANGES 26 Feb 2010 17:11:50 - 1.3274 @@ -1,5 +1,7 @@ 5.2b1 -> 5.3a1 +- devzero2000: use "find" and "mv" if useful instead of "cp -pr" for %doc expansion + for preventing arg list too long message - rpm.org: swipe Tarjan's loopy scissors for hacking. - jbj: rpmts: add pluggable check/order/run method vectors. - jbj: hkp: add keys.rpm5.org as the default pubkey server. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ files.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 01-Mar-2010 15:18:00
Branch: HEAD Handle: 201003011418
Modified files:
rpm/build files.c
Log:
reverting back to revision 1.364 of files.c: drop the last b0rken
patch
Summary:
RevisionChanges Path
1.366 +3 -13 rpm/build/files.c
patch -p0 <<'@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.365 -r1.366 files.c
--- rpm/build/files.c 26 Feb 2010 17:09:19 - 1.365
+++ rpm/build/files.c 1 Mar 2010 14:18:00 - 1.366
@@ -1067,20 +1067,10 @@
fl->passedSpecialDoc = 1;
fl->isSpecialDoc = 1;
}
-/* XXX : prevent almost all case of arg list too long messages
- the japh shell is equivalent to (x = specialDocBuf y =$DOCDIR )
-( [ -d x ] && cp -pr x y ; ) || find x 2>/dev/null | xargs -t
-n10 -I '{}' mv -f {} y 2>/dev/null
-*/
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "( [ -d '", 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "' ] && cp -pr ",
0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "; ) || find ", 0);
+
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "cp -pr ", 0);
pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " 2>/dev/null |
xargs -n10 -I '{}' mv -f {} ", 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 0);
- pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " 2>/dev/null", 1);
+ pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 1);
}
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 01-Mar-2010 15:20:05 Branch: HEAD Handle: 2010030114200400 Modified files: rpm CHANGES Log: drop the CHANGES of the last b0rken patch: build/files.c was reverted to revision 1.364 Summary: RevisionChanges Path 1.3279 +0 -2 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3278 -r1.3279 CHANGES --- rpm/CHANGES 28 Feb 2010 13:37:00 - 1.3278 +++ rpm/CHANGES 1 Mar 2010 14:20:04 - 1.3279 @@ -4,8 +4,6 @@ macros. - proyvind: filetriggers: don't pass filename as argument to scripts, (all) filenames are passed through stdin already. -- devzero2000: use "find" and "mv" if useful instead of "cp -pr" for %doc expansion - for preventing arg list too long message - rpm.org: swipe Tarjan's loopy scissors for hacking. - jbj: rpmts: add pluggable check/order/run method vectors. - jbj: hkp: add keys.rpm5.org as the default pubkey server. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ arbitrarytag.spec
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 01-Mar-2010 16:54:06
Branch: HEAD Handle: 2010030115540600
Added files:
rpm/tests arbitrarytag.spec
Log:
add a simple arbitrarytag test spec
Summary:
RevisionChanges Path
1.1 +50 -0 rpm/tests/arbitrarytag.spec
patch -p0 <<'@@ .'
Index: rpm/tests/arbitrarytag.spec
$ cvs diff -u -r0 -r1.1 arbitrarytag.spec
--- /dev/null 2010-03-01 16:45:30 +0100
+++ arbitrarytag.spec 2010-03-01 16:54:06 +0100
@@ -0,0 +1,50 @@
+
+# My arbitrary tags
+
+%global my_arbitrary_tagsRHSA:CVEID:RHBZ
+
+# Append my arbitrary tags
+
+%global _arbitrary_tags %(printf %%s
'%{_arbitrary_tags}:%{my_arbitrary_tags}')
+Name: arbitrarytag
+Version: 1.0
+Release: 1
+License: GPL
+Group: Development/Tools
+URL: http://rpm5.org/
+Summary: %{name}
+BuildArch: noarch
+###
+# Arbitrary tag
+###
+#CVEID: CVE-2008-5964
+#RHSA: RHSA-2007:1128-6 RHSA-2008:1129-6
+#RHBZ: 410031 410032
+%description
+This is an toy use case of arbitrary tags.
+It is not the best example of using tags
+as CVEID because they should be in repo-md
+but none care, as many yum-plugin-security
+users know.
+Execute the command below
+ $rpm -q --qf '%%{CVEID}\n%%{RHSA}\n%%{RHBZ}\n'
+to see the vulnerability fixed.
+
+
+%prep
+# empty
+%build
+# empty
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/tmp
+echo " " > %{buildroot}/tmp/%{name}
+%clean
+rm -rf %{buildroot}
+%files
+%defattr(-,root,root,-)
+/tmp/%{name}
+%changelog
+* Wed Feb 24 2010 Elia Pinto - 1.0-1
+- First Built but already fix a bunch of vulnerability.
+ Yeap, in fact do nothing.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ Makefile.am rpm-arg-max-doc.spec
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 02-Mar-2010 18:34:14
Branch: HEAD Handle: 2010030217341400
Added files:
rpm/tests rpm-arg-max-doc.spec
Modified files:
rpm/tests Makefile.am
Log:
add an rpm-arg-max-doc.spec toy test spec in tests
Summary:
RevisionChanges Path
1.63+1 -0 rpm/tests/Makefile.am
1.1 +62 -0 rpm/tests/rpm-arg-max-doc.spec
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
$ cvs diff -u -r1.62 -r1.63 Makefile.am
--- rpm/tests/Makefile.am 23 Feb 2010 17:16:03 - 1.62
+++ rpm/tests/Makefile.am 2 Mar 2010 17:34:14 - 1.63
@@ -38,6 +38,7 @@
#XXX rpmpopt = $(abs_top_builddir)/rpmpopt
rpm =$(abs_top_builddir)/rpm --macros $(macros)
+rpmbuild = $(abs_top_builddir)/rpmbuild --macros $(macros)
rpm2cpio = $(abs_top_builddir)/tools/rpm2cpio
rpmcache = $(abs_top_builddir)/tools/rpmcache --macros $(macros)
rpmdigest = $(abs_top_builddir)/tools/rpmdigest
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/rpm-arg-max-doc.spec
$ cvs diff -u -r0 -r1.1 rpm-arg-max-doc.spec
--- /dev/null 2010-03-02 18:34:08 +0100
+++ rpm-arg-max-doc.spec 2010-03-02 18:34:14 +0100
@@ -0,0 +1,62 @@
+Summary: An toy rpm that could cause an "arg list too long" error in build
+Name: rpm-arg-max-doc
+Version: 1.0
+Release: 1
+License: LGPL
+Group: Development/Tools
+URL: http://rpm5.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildArch: noarch
+%description
+%{summary}
+
+Visit this url for some background
+http://www.in-ulm.de/~mascheck/various/argmax/
+information
+
+%prep
+%setup -c -T
+%build
+%{__mkdir_p} %{name}-document
+cd %{name}-document
+ARG_MAX_MEDIUM=2
+[ -x /usr/bin/getconf ] && { ARG_MAX="$(/usr/bin/getconf ARG_MAX 2>&-)" && [
-n "$ARG_MAX" ] || ARG_MAX=$ARG_MAX_MEDIUM ; }
+[ -z $ARG_MAX ] && ARG_MAX=$ARG_MAX_MEDIUM
+[ $ARG_MAX -lt $ARG_MAX_MEDIUM ] && ARG_MAX=$ARG_MAX_MEDIUM
+perl -e '
+use diagnostics;
+use Fcntl;
+use POSIX qw(limits_h);
+my $FILEHAND="filehandle";
+if (@ARGV != 1) {
+ print "usage: \n";
+ exit;
+}
+# XXX: ARG_MAX could be undefined
+my $my_arg_max=$ARGV[0];
+# XXX: 30 is almost the name file lenght
+my $my_num_files=$my_arg_max/30;
+if ($my_arg_max !~ /^\d+$/) { die "arg-max is not a number\n" };
+my $base_name = sprintf("document-%d-%d-", $$, time);
+my $count = 0;
+until( $count++ >$my_num_files ) {
+ $base_name =~ s/-(\d+)$/"-" . (1 + $1)/e;
+ sysopen($FILEHAND, $base_name, O_WRONLY|O_EXCL|O_CREAT);
+}
+' $ARG_MAX
+
+%install
+#empty
+rm -rf $RPM_BUILD_ROOT
+exit 0
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc %{name}-document/doc*
+
+%changelog
+* Tue Mar 2 2010 Elia Pinto 1.0-1
+- First Built
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 02-Mar-2010 18:36:27 Branch: HEAD Handle: 2010030217362600 Modified files: rpm CHANGES Log: update CHANGES also Summary: RevisionChanges Path 1.3280 +1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3279 -r1.3280 CHANGES --- rpm/CHANGES 1 Mar 2010 14:20:04 - 1.3279 +++ rpm/CHANGES 2 Mar 2010 17:36:26 - 1.3280 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 +- devzero2000: add an rpm-arg-max-doc.spec toy test spec in tests - proyvind: python: make sure that we always use our own rpm build and macros. - proyvind: filetriggers: don't pass filename as argument to scripts, @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES Makefile.am popt/auto/ Makefile.am desc.in ty...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 18-May-2010 18:45:55
Branch: HEAD Handle: 2010051816455202
Added files:
popttest-poptrc
popt/auto types
Modified files:
poptCHANGES Makefile.am autogen.sh configure.ac
test1.c
popt/auto Makefile.am desc.in
Removed files:
popttest-poptrc.in
popt/auto types.in
Log:
update to new autofu/automagic. Do make distcheck work
Summary:
RevisionChanges Path
1.122 +1 -0 popt/CHANGES
1.61+33 -36 popt/Makefile.am
1.3 +4 -2 popt/auto/Makefile.am
1.2 +1 -1 popt/auto/desc.in
1.1 +147 -0 popt/auto/types
1.4 +0 -147popt/auto/types.in
1.17+4 -28 popt/autogen.sh
1.57+101 -63popt/configure.ac
1.8 +13 -0 popt/test-poptrc
1.2 +0 -13 popt/test-poptrc.in
1.45+2 -0 popt/test1.c
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.121 -r1.122 CHANGES
--- popt/CHANGES 17 Feb 2010 20:12:56 - 1.121
+++ popt/CHANGES 18 May 2010 16:45:52 - 1.122
@@ -1,4 +1,5 @@
1.15 -> 1.16:
+- devzero2000: update to new autofu/automagic. Do make distcheck work.
- add lv.po, update translations (Translation Project).
- include xcode project files in distributed popt tar ball.
- make distcheck is now squeaky clean.
@@ .
patch -p0 <<'@@ .'
Index: popt/Makefile.am
$ cvs diff -u -r1.60 -r1.61 Makefile.am
--- popt/Makefile.am 7 May 2010 17:25:46 - 1.60
+++ popt/Makefile.am 18 May 2010 16:45:52 - 1.61
@@ -1,43 +1,37 @@
# Makefile for popt library.
-AUTOMAKE_OPTIONS = 1.4 foreign
+ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = -I. -I$(top_srcdir)
LINT = splint
MCCABE = pmccabe
-EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) \
- m4/Makefile.in \
+EXTRA_DIST = lookup3.c autogen.sh CHANGES \
footer_no_timestamp.html libpopt.vers \
- testit.sh test-poptrc \
+ $(TESTS) test-poptrc\
popt.xcodeproj/project.pbxproj \
- popt.ps
+ popt.ps Doxyfile
SUBDIRS = po . auto
-AM_CPPFLAGS = -I. -I$(top_srcdir)
noinst_HEADERS = poptint.h system.h
-noinst_PROGRAMS = test1 test2 tdict # test3
-test1_SOURCES = test1.c
-test1_LDFLAGS =
-test1_LDADD = $(usrlib_LTLIBRARIES)
-test2_SOURCES = test2.c
-test2_LDFLAGS =
-test2_LDADD = $(usrlib_LTLIBRARIES)
-#test3_SOURCES = test3.c
-#test3_LDFLAGS =
-#test3_LDADD = $(usrlib_LTLIBRARIES)
-tdict_SOURCES = tdict.c
-tdict_LDFLAGS =
-tdict_LDADD = $(usrlib_LTLIBRARIES)
+check_PROGRAMS = test1 test2 tdict
-noinst_SCRIPTS = testit.sh
+check_SCRIPTS= $(TESTS)
-TESTS_ENVIRONMENT = \
-test1="$(top_builddir)/test1"
-TESTS = $(top_srcdir)/testit.sh
+test1_CPPFLAGS = -I $(top_builddir)
+test2_CPPFLAGS = -I $(top_builddir)
+tdict_CPPFLAGS = -I $(top_builddir)
+test1_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
+test2_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
+tdict_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
+
+TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH \
+ $(SHELL)
+TESTS = $(top_builddir)/testit.sh
include_HEADERS = popt.h
@@ -54,7 +48,7 @@
libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/libpopt.vers
endif
-man_MANS = popt.3
+dist_man_MANS = popt.3
BUILT_SOURCES = popt.pc # popt.lcd
@@ -72,36 +66,43 @@
sources:
@echo $(libpopt_la_SOURCES:%=popt/%)
-.PHONY: lint
+if HAVE_SPLINT
lint:
$(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
-.PHONY: mccabe
+endif HAVE_SPLINT
+
+if HAVE_MCCABE
mccabe:
$(MCCABE) $(libpopt_la_SOURCES) | sort -n -r | head -n 10
+endif HAVE_MCCABE
+
+if DOXYGEN_ENABLE
-.PHONY: doxygen
doxygen: Doxyfile
rm -rf doxygen
mkdir -p doxygen
doxygen
-.PHONY: lcov-reset # run lcov from scratch, always
+endif DOXYGEN_ENABLE
+
+if HAVE_LCOV
+# run lcov from scratch, always
lcov-reset:
make lcov-run
[CVS] RPM: popt/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 18-Jun-2010 14:22:02 Branch: HEAD Handle: 2010061812220200 Modified files: popt.cvsignore Log: add po and derived test object file to .cvsignore Summary: RevisionChanges Path 1.28+2 -0 popt/.cvsignore patch -p0 <<'@@ .' Index: popt/.cvsignore $ cvs diff -u -r1.27 -r1.28 .cvsignore --- popt/.cvsignore 14 Jun 2010 13:38:24 - 1.27 +++ popt/.cvsignore 18 Jun 2010 12:22:02 - 1.28 @@ -41,6 +41,7 @@ test1 test2 test3 +test?-test?.o *.gcda *.gcno *.la @@ -48,4 +49,5 @@ *.lo *.swp popt.pc +po popt-*.tar.gz @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ autogen.sh
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 18-Jun-2010 14:23:30 Branch: HEAD Handle: 2010061812233000 Modified files: poptautogen.sh Log: drop redundant call to autopoint from autogen.sh Summary: RevisionChanges Path 1.18+1 -1 popt/autogen.sh patch -p0 <<'@@ .' Index: popt/autogen.sh $ cvs diff -u -r1.17 -r1.18 autogen.sh --- popt/autogen.sh 18 May 2010 16:45:52 - 1.17 +++ popt/autogen.sh 18 Jun 2010 12:23:30 - 1.18 @@ -11,4 +11,4 @@ find . -name "autom4te.cache" | xargs rm -rf [ ! -d m4 ]&& mkdir m4 [ ! -d build-aux ] && mkdir build-aux -autopoint -f && autoreconf -vfi +autoreconf -vfi @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 18-Jun-2010 14:34:52 Branch: HEAD Handle: 2010061812345100 Modified files: poptconfigure.ac Log: resurect build-aux in configure.ac Summary: RevisionChanges Path 1.60+1 -1 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.59 -r1.60 configure.ac --- popt/configure.ac 18 Jun 2010 01:20:16 - 1.59 +++ popt/configure.ac 18 Jun 2010 12:34:51 - 1.60 @@ -8,7 +8,7 @@ AC_CANONICAL_TARGET AM_MAINTAINER_MODE # Must come before AM_INIT_AUTOMAKE. -# AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_GNU_GETTEXT_VERSION([0.17]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ popt.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 18-Jun-2010 17:39:25
Branch: HEAD Handle: 2010061815392400
Modified files:
poptpopt.c
Log:
added an assert
Summary:
RevisionChanges Path
1.149 +2 -1 popt/popt.c
patch -p0 <<'@@ .'
Index: popt/popt.c
$ cvs diff -u -r1.148 -r1.149 popt.c
--- popt/popt.c 18 Jun 2010 15:09:24 - 1.148
+++ popt/popt.c 18 Jun 2010 15:39:24 - 1.149
@@ -953,6 +953,7 @@
/* Parse comma separated attributes. */
te = tbuf = xstrdup(s);
+assert(te);
while ((t = te) != NULL && *t) {
while (*te != '\0' && *te != ',')
te++;
@@ -1213,7 +1214,7 @@
/**
* Return argInfo field, handling POPT_ARGFLAG_TOGGLE overrides.
* @param concontext
- * @param opt option
+ * @param *opt option
* @return argInfo
*/
static unsigned int poptArgInfo(poptContext con, const struct poptOption *
opt)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 21-Jun-2010 12:21:06 Branch: HEAD Handle: 2010062110210500 Modified files: poptconfigure.ac Log: Fix configure.ac : AC_CANONICAL_TARGET was called in the wrong order This conflict with build-aux and confuse autoconf Summary: RevisionChanges Path 1.63+7 -4 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.62 -r1.63 configure.ac --- popt/configure.ac 19 Jun 2010 18:43:57 - 1.62 +++ popt/configure.ac 21 Jun 2010 10:21:05 - 1.63 @@ -1,19 +1,22 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.63) +AC_PREREQ([2.63]) AC_INIT([popt],[1.17.DEVEL],[popt-de...@rpm5.org]) + AC_CONFIG_SRCDIR([lookup3.c]) AC_CONFIG_HEADERS([config.h]) -AC_CANONICAL_TARGET -AM_MAINTAINER_MODE +AC_CONFIG_MACRO_DIR([m4]) + # Must come before AM_INIT_AUTOMAKE. AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +# AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) AM_ICONV +AM_MAINTAINER_MODE # Library code modified: REVISION++ # Interfaces changed/added/removed: CURRENT++ REVISION=0 # Interfaces added: AGE++ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 21-Jun-2010 13:28:26 Branch: HEAD Handle: 2010062111282600 Modified files: poptconfigure.ac Log: added AC_TYPE_INT64_T for typedef int64_t * poptStack_t in popt.c Summary: RevisionChanges Path 1.64+1 -0 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.63 -r1.64 configure.ac --- popt/configure.ac 21 Jun 2010 10:21:05 - 1.63 +++ popt/configure.ac 21 Jun 2010 11:28:26 - 1.64 @@ -107,6 +107,7 @@ AC_TYPE_UINT16_T AC_TYPE_UINT32_T AC_TYPE_UINT8_T +AC_TYPE_INT64_T # Checks for library functions. AC_CHECK_FUNC(setreuid, [], [ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES popt.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 21-Jun-2010 17:13:49
Branch: HEAD Handle: 2010062115134900
Modified files:
poptCHANGES popt.c
Log:
Fix: do make check work again. And yes the style is certainly not
perfect.
Summary:
RevisionChanges Path
1.139 +1 -0 popt/CHANGES
1.151 +6 -4 popt/popt.c
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.138 -r1.139 CHANGES
--- popt/CHANGES 18 Jun 2010 18:59:20 - 1.138
+++ popt/CHANGES 21 Jun 2010 15:13:49 - 1.139
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+- devzero2000: fix: make check work again
- jbj: remove llvm warning from s/int/size_t/.
- jbj: bump version to 1.17.DEVEL.
- jbj: tests: test-cases for UNWANTEDARGS (Wayne
Davison).
@@ .
patch -p0 <<'@@ .'
Index: popt/popt.c
$ cvs diff -u -r1.150 -r1.151 popt.c
--- popt/popt.c 18 Jun 2010 18:59:20 - 1.150
+++ popt/popt.c 21 Jun 2010 15:13:49 - 1.151
@@ -1796,27 +1796,29 @@
{
poptItem * items, item;
size_t * nitems;
+int* naliases;
switch (flags) {
case 1:
items = &con->execs;
nitems = &con->numExecs;
+*items = xrealloc((*items), ((*nitems) + 1) * sizeof(**items));
break;
case 0:
items = &con->aliases;
- nitems = &con->numAliases;
+ naliases = &con->numAliases;
+*items = xrealloc((*items), ((*naliases) + 1) * sizeof(**items));
break;
default:
return 1;
/*...@notreached@*/ break;
}
-*items = xrealloc((*items), ((*nitems) + 1) * sizeof(**items));
assert(*items); /* XXX can't happen */
if ((*items) == NULL)
return 1;
-item = (*items) + (*nitems);
+item =(flags ? (*items) + (*nitems) : (*items) + (*naliases) );
item->option.longName =
(newItem->option.longName ? xstrdup(newItem->option.longName) : NULL);
@@ -1831,7 +1833,7 @@
item->argc = newItem->argc;
item->argv = newItem->argv;
-(*nitems)++;
+(flags ? (*nitems)++ : (*naliases)++ );
return 0;
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jun-2010 18:06:13
Branch: HEAD Handle: 2010062316061300
Modified files:
poptCHANGES configure.ac
Log:
define build-gcov disabled by default
Summary:
RevisionChanges Path
1.140 +1 -0 popt/CHANGES
1.65+16 -14 popt/configure.ac
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.139 -r1.140 CHANGES
--- popt/CHANGES 21 Jun 2010 15:13:49 - 1.139
+++ popt/CHANGES 23 Jun 2010 16:06:13 - 1.140
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+- devzero2000: define build-gcov disabled by default
- devzero2000: fix: make check work again
- jbj: remove llvm warning from s/int/size_t/.
- jbj: bump version to 1.17.DEVEL.
@@ .
patch -p0 <<'@@ .'
Index: popt/configure.ac
$ cvs diff -u -r1.64 -r1.65 configure.ac
--- popt/configure.ac 21 Jun 2010 11:28:26 - 1.64
+++ popt/configure.ac 23 Jun 2010 16:06:13 - 1.65
@@ -56,7 +56,7 @@
if test "$DOXYGEN_ENABLE" = "no"; then
DOXYGEN=NO_DOXYGEN
fi
-AM_CONDITIONAL([DOXYGEN_ENABLE], test x$DOXYGEN != xNO_DOXYGEN )
+AM_CONDITIONAL([DOXYGEN_ENABLE], [test x$DOXYGEN != xNO_DOXYGEN])
# Define for popt_sysconfig
popt_sysconfdir="${sysconfdir}"
@@ -65,33 +65,35 @@
# Check for gcov support.
# Check for lcov Makefile conditional
-HAVE_LCOV=no
AC_ARG_ENABLE(build-gcov,
-AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for
gcov]), [dnl
-if test ".$enableval" = .yes; then
-if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
-dnl # GNU GCC (usually "gcc")
+AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov
@<:@default=no@:>@. ]),
+[enable_build_gcov=${enableval}],
+[enable_build_gcov=no])
+
+AS_IF([test "x$enable_build_gcov" != xno],
+ [
+if test "x$GCC" != x ; then
CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
AC_CHECK_PROG(HAVE_LCOV,lcov,"yes","no" )
fi
-fi
-])
-AM_CONDITIONAL([HAVE_LCOV], test x$LCOV != xno )
+ ])
+
+AM_CONDITIONAL([HAVE_LCOV], [test x$LCOV != xno])
# Check for api-sanity-autotest.pl Makefile conditional support for
check-local
AC_CHECK_PROG(HAVE_API_SANITY_AUTOTEST,api-sanity-autotest.pl,"yes","no" )
-AM_CONDITIONAL([HAVE_API_SANITY_AUTOTEST], test x$HAVE_API_SANITY_AUTOTEST
!= xno )
+AM_CONDITIONAL([HAVE_API_SANITY_AUTOTEST], [test x$HAVE_API_SANITY_AUTOTEST
!= xno])
# Check for splint Makefile conditional support
AC_CHECK_PROG(HAVE_SPLINT,splint,"yes","no" )
-AM_CONDITIONAL([HAVE_SPLINT], test x$HAVE_SPLINT != xno )
+AM_CONDITIONAL([HAVE_SPLINT],[test x$HAVE_SPLINT != xno])
# Check for pmccabe Makefile conditional support
AC_CHECK_PROG(HAVE_MCCABE,pmccabe,"yes","no" )
-AM_CONDITIONAL([HAVE_MCCABE], test x$HAVE_MCCABE != xno )
+AM_CONDITIONAL([HAVE_MCCABE],[test x$HAVE_MCCABE != xno])
# Checks for libraries.
@@ -113,7 +115,7 @@
AC_CHECK_FUNC(setreuid, [], [
AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null
;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
])
-AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy
strerror vasprintf srandom)
+AC_CHECK_FUNCS([getuid geteuid iconv mtrace __secure_getenv setregid stpcpy
strerror vasprintf srandom])
# drop AC_FUNC_MALLOC, REALLOC and STRTOD
AC_CHECK_FUNCS([malloc realloc strtod memset nl_langinfo stpcpy strchr
strerror strrchr])
@@ -134,7 +136,7 @@
(default is system dependent)]),
[have_ld_version_script=$enableval],
[ : ] )
-AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" =
"yes")
+AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT],[test "$have_ld_version_script" =
"yes"])
# Autofu for pkgconfig
# Define a (hope) portable Libs pkgconfig directive that
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES testit.sh
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jun-2010 18:24:34
Branch: HEAD Handle: 2010062316243400
Modified files:
poptCHANGES testit.sh
Log:
add malloc vodo to testit.sh
Summary:
RevisionChanges Path
1.141 +1 -0 popt/CHANGES
1.34+14 -0 popt/testit.sh
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.140 -r1.141 CHANGES
--- popt/CHANGES 23 Jun 2010 16:06:13 - 1.140
+++ popt/CHANGES 23 Jun 2010 16:24:34 - 1.141
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+- devzero2000: add malloc vodo to testit.sh
- devzero2000: define build-gcov disabled by default
- devzero2000: fix: make check work again
- jbj: remove llvm warning from s/int/size_t/.
@@ .
patch -p0 <<'@@ .'
Index: popt/testit.sh
$ cvs diff -u -r1.33 -r1.34 testit.sh
--- popt/testit.sh18 Jun 2010 18:36:19 - 1.33
+++ popt/testit.sh23 Jun 2010 16:24:34 - 1.34
@@ -1,4 +1,18 @@
#!/bin/sh
+###
+# malloc voo-doo
+###
+# see http://lists.gnupg.org/pipermail/gcrypt-devel/2010-June/001605.html
+export MALLOC_CHECK_=3
+# http://udrepper.livejournal.com/11429.html
+export MALLOC_PERTURB_=`expr \( $RANDOM % 255 \) + 1 `
+#
+if [ -z "${MALLOC_PERTURB_}" ] # XXX: some shell don't have RANDOM ?
+then
+ r=`ps -ef | cksum | cut -f1 -d" " 2>/dev/null`
+ [ -z "${r}" ] && r=1234567890
+export MALLOC_PERTURB_=`expr \( $r % 255 \) + 1 `
+fi
run() {
prog=$1; shift
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/po/ LINGUAS
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 25-Jun-2010 17:21:21 Branch: HEAD Handle: 2010062515212000 Added files: rpm/po LINGUAS Modified files: rpm configure.ac Log: estetic : prefer po/LINGUAS to the obsolete configure ALL_LINGUAS for gnu gettext Summary: RevisionChanges Path 2.441 +0 -2 rpm/configure.ac 1.1 +32 -0 rpm/po/LINGUAS patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.440 -r2.441 configure.ac --- rpm/configure.ac 19 Jun 2010 18:01:12 - 2.440 +++ rpm/configure.ac 25 Jun 2010 15:21:20 - 2.441 @@ -96,8 +96,6 @@ AC_SUBST([RPM_TIMESTAMP]) AC_SUBST([RPM_VENDOR]) -dnl # set of available languages. -ALL_LINGUAS="cs da de es fi fr id is it ja ko nb nl pa pl pt pt_BR ru sk sl sr sv tr uk vi zh_TW" dnl ## dnl ## TOOL-CHAIN CHECKS @@ . patch -p0 <<'@@ .' Index: rpm/po/LINGUAS $ cvs diff -u -r0 -r1.1 LINGUAS --- /dev/null 2010-06-25 17:15:45.0 +0200 +++ LINGUAS 2010-06-25 17:21:21.082219096 +0200 @@ -0,0 +1,32 @@ +# Set of available languages. +# +# +# +cs +da +de +...@boldquot +...@quot +es +fi +fr +id +is +it +ja +ko +nb +nl +pa +pl +pt +pt_BR +ru +sk +sl +sr +sv +tr +uk +vi +zh_TW @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ autogen.sh
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 25-Jun-2010 19:07:16 Branch: HEAD Handle: 2010062517071600 Modified files: rpm autogen.sh Log: generate po/LINGUAS from autogen.sh: but probably it is necessary a better integration with the autofu Summary: RevisionChanges Path 2.106 +5 -0 rpm/autogen.sh patch -p0 <<'@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.105 -r2.106 autogen.sh --- rpm/autogen.sh1 Jun 2009 13:27:55 - 2.105 +++ rpm/autogen.sh25 Jun 2010 17:07:16 - 2.106 @@ -73,6 +73,11 @@ echo "---> generate files via GNU libtool (libtoolize)" libtoolize --quiet --copy --force --install echo "---> generate files via GNU gettext (autopoint)" +po_dir=./po +LANG=C +ls "$po_dir"/*.po 2>/dev/null | + sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" + autopoint --force echo "---> generate files via GNU autoconf (aclocal, autoheader)" rm -f aclocal.m4 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 25-Jun-2010 19:20:57 Branch: HEAD Handle: 2010062517205600 Modified files: rpm Makefile.am Log: generate po/LINGUAS by make updatepo Summary: RevisionChanges Path 2.250 +3 -0 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.249 -r2.250 Makefile.am --- rpm/Makefile.am 7 May 2010 18:30:53 - 2.249 +++ rpm/Makefile.am 25 Jun 2010 17:20:56 - 2.250 @@ -178,6 +178,9 @@ .PHONY: updatepo updatepo: rsync -Lrtvz translationproject.org::tp/latest/rpm/ po + po_dir=./po + LANG=C + ls "$po_dir"/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > $po_dir/LINGUAS CVSTAG = r$(subst .,-,$(VERSION)) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/po/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 29-Jun-2010 09:54:10 Branch: HEAD Handle: 2010062907541000 Modified files: rpm/po .cvsignore Log: added LINGUAS to po .cvsignore Summary: RevisionChanges Path 1.8 +1 -0 rpm/po/.cvsignore patch -p0 <<'@@ .' Index: rpm/po/.cvsignore $ cvs diff -u -r1.7 -r1.8 .cvsignore --- rpm/po/.cvsignore 10 Jun 2007 23:29:05 - 1.7 +++ rpm/po/.cvsignore 29 Jun 2010 07:54:10 - 1.8 @@ -8,6 +8,7 @@ stamp-cat-id stamp-po cat-id-tbl.c +LINGUAS *.header *.mo *.gmo @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ .cvsignore popt/po/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 29-Jun-2010 10:34:26 Branch: HEAD Handle: 2010062908342500 Modified files: popt.cvsignore popt/po .cvsignore Log: added LINGUAS to po .cvsignore Summary: RevisionChanges Path 1.29+0 -1 popt/.cvsignore 1.9 +1 -0 popt/po/.cvsignore patch -p0 <<'@@ .' Index: popt/.cvsignore $ cvs diff -u -r1.28 -r1.29 .cvsignore --- popt/.cvsignore 18 Jun 2010 12:22:02 - 1.28 +++ popt/.cvsignore 29 Jun 2010 08:34:25 - 1.29 @@ -49,5 +49,4 @@ *.lo *.swp popt.pc -po popt-*.tar.gz @@ . patch -p0 <<'@@ .' Index: popt/po/.cvsignore $ cvs diff -u -r1.8 -r1.9 .cvsignore --- popt/po/.cvsignore25 Jul 2009 04:50:43 - 1.8 +++ popt/po/.cvsignore29 Jun 2010 08:34:25 - 1.9 @@ -15,3 +15,4 @@ *.gmo *.sed *.sin +LINGUAS @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES Makefile.am popt/auto/ Makefile.am popt/ auto...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 29-Jun-2010 12:47:59
Branch: HEAD Handle: 2010062910475701
Modified files:
poptCHANGES Makefile.am autogen.sh configure.ac
system.h
popt/auto Makefile.am
Log:
A bunch of minor fix
- redo configure.ac and Makefile.am with different auto, probably to refine
the ugly check command with some m4 macro.
- add LINGUAS in favor of ALL_LINGUAS in autogen.sh and Makefile.am
- fixup aix portability issue with alloca(system.h and configure.ac)
and native compiler : make check work also
- keep make dist and distcheck working
Summary:
RevisionChanges Path
1.142 +2 -0 popt/CHANGES
1.64+36 -26 popt/Makefile.am
1.4 +3 -5 popt/auto/Makefile.am
1.19+4 -0 popt/autogen.sh
1.66+45 -42 popt/configure.ac
1.16+14 -0 popt/system.h
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.141 -r1.142 CHANGES
--- popt/CHANGES 23 Jun 2010 16:24:34 - 1.141
+++ popt/CHANGES 29 Jun 2010 10:47:57 - 1.142
@@ -1,4 +1,6 @@
1.17 -> 2.0:
+- devzero2000: some minor fix to autofu and also a minor portability
problem on AIX
+ with the native compiler
- devzero2000: add malloc vodo to testit.sh
- devzero2000: define build-gcov disabled by default
- devzero2000: fix: make check work again
@@ .
patch -p0 <<'@@ .'
Index: popt/Makefile.am
$ cvs diff -u -r1.63 -r1.64 Makefile.am
--- popt/Makefile.am 18 Jun 2010 14:09:05 - 1.63
+++ popt/Makefile.am 29 Jun 2010 10:47:57 - 1.64
@@ -3,9 +3,6 @@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I. -I$(top_srcdir)
-LINT = splint
-MCCABE = pmccabe
-
EXTRA_DIST = lookup3.c autogen.sh CHANGES \
footer_no_timestamp.html libpopt.vers \
$(TESTS) test-poptrc\
@@ -50,37 +47,36 @@
dist_man_MANS = popt.3
-BUILT_SOURCES = popt.pc # popt.lcd
+BUILT_SOURCES = popt.pc
distclean-local:
- rm -rf .ccache
-
-.PHONY: updatepo
-updatepo:
- rsync -Lrtvz translationproject.org::tp/latest/popt/ po
-
-popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS}
${noinst_HEADERS}
- lclint -dump $@ ${libpopt_la_SOURCES}
+ rm -rf .ccache
-.PHONY: sources
-sources:
- @echo $(libpopt_la_SOURCES:%=popt/%)
+clean-local:
+ rm -rf doxygen *.gcda *.gcno lcov-result
if HAVE_SPLINT
lint:
- $(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
-endif HAVE_SPLINT
+ $(SPLINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES}
+
+popt.lcd: Makefile.am ${libpopt_la_SOURCES} ${include_HEADERS}
${noinst_HEADERS}
+ $(SPLINT) -dump $@ ${libpopt_la_SOURCES}
+endif
+if HAVE_MCCABE
mccabe:
$(MCCABE) $(libpopt_la_SOURCES) | sort -n -r | head -n 10
+endif
+
if DOXYGEN_ENABLE
doxygen: Doxyfile
rm -rf doxygen
mkdir -p doxygen
- doxygen
-endif DOXYGEN_ENABLE
+ $(DOXYGEN)
+endif
+if HAVE_LCOV
# run lcov from scratch, always
lcov-reset:
make lcov-run
@@ -98,10 +94,24 @@
# generate report based on current coverage data
lcov-report:
- mkdir lcov
- lcov --directory . --capture --output-file lcov/lcov.info
- lcov -l lcov/lcov.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d:
-f1 > lcov/remove
- lcov -r lcov/lcov.info `cat lcov/remove` > lcov/lcov.cleaned.info
- rm lcov/remove
- mv lcov/lcov.cleaned.info lcov/lcov.info
- genhtml -t "$(PACKAGE_STRING)" -o lcov lcov/lcov.info
+ rm -rf lcov-result
+ mkdir lcov-result
+ $(LCOV) --directory . --capture --output-file lcov-result/lcov.info
+ $(LCOV) -l lcov-result/lcov.info | grep -v "`cd $(top_srcdir) && pwd`"
| cut -d: -f1 > lcov-result/remove
+ $(LCOV) -r lcov-result/lcov.info `cat lcov-result/remove` >
lcov-result/lcov.cleaned.info
+ rm lcov-result/remove
+ mv lcov-result/lcov.cleaned.info lcov-result/lcov.info
+ genhtml -t "$(PACKAGE_STRING)" -o lcov lcov-result/lcov.info
+endif
+
+.PHONY: updatepo
+updatepo:
+
[CVS] RPM: popt/ Makefile.am popt/auto/ Makefile.am popt/ test1.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 30-Jun-2010 17:27:17
Branch: HEAD Handle: 2010063015271601
Modified files:
poptMakefile.am test1.c
popt/auto Makefile.am
Log:
Fixed VPATH building with arbitrary directory structure
make distcheck worked before just for luck.
Summary:
RevisionChanges Path
1.65+1 -1 popt/Makefile.am
1.5 +1 -1 popt/auto/Makefile.am
1.49+9 -0 popt/test1.c
patch -p0 <<'@@ .'
Index: popt/Makefile.am
$ cvs diff -u -r1.64 -r1.65 Makefile.am
--- popt/Makefile.am 29 Jun 2010 10:47:57 - 1.64
+++ popt/Makefile.am 30 Jun 2010 15:27:17 - 1.65
@@ -26,7 +26,7 @@
test2_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
tdict_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
-TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH \
+TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir)
testpoptrc="$(top_srcdir)/test-poptrc" PATH=.:../src:$$PATH \
$(SHELL)
TESTS = $(top_builddir)/testit.sh
@@ .
patch -p0 <<'@@ .'
Index: popt/auto/Makefile.am
$ cvs diff -u -r1.4 -r1.5 Makefile.am
--- popt/auto/Makefile.am 29 Jun 2010 10:47:58 - 1.4
+++ popt/auto/Makefile.am 30 Jun 2010 15:27:16 - 1.5
@@ -8,5 +8,5 @@
if HAVE_API_SANITY_AUTOTEST
check-local:
-[ -d tests ] && ${API_SANITY_AUTOTEST} -l popt -d desc -clean
- -${API_SANITY_AUTOTEST} -l popt -d desc -st types -gen -build -run
+ -${API_SANITY_AUTOTEST} -l popt -d desc -st $(top_srcdir)/auto/types
-gen -build -run
endif HAVE_API_SANITY_AUTOTEST
@@ .
patch -p0 <<'@@ .'
Index: popt/test1.c
$ cvs diff -u -r1.48 -r1.49 test1.c
--- popt/test1.c 17 Jun 2010 17:15:28 - 1.48
+++ popt/test1.c 30 Jun 2010 15:27:17 - 1.49
@@ -270,8 +270,17 @@
optCon = poptGetContext("test1", argc, argv, options, 0);
/*...@=temptrans@*/
(void) poptReadConfigFile(optCon, "./test-poptrc");
+#ifdef HAVE_STDLIB_H
+char * testpoptrc;
+testpoptrc = getenv ("testpoptrc");
+if (testpoptrc != NULL )
+(void) poptReadConfigFile(optCon, testpoptrc);
+else
+printf("something go wrong\n");
+#else
/* : make distcheck succed : test1 is in popt-/_build */
(void) poptReadConfigFile(optCon, "../../test-poptrc");
+#endif
(void) poptReadDefaultConfig(optCon, 1);
poptSetExecPath(optCon, ".", 1);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES popt/auto/ Makefile.am popt/ test1.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 30-Jun-2010 18:21:02
Branch: HEAD Handle: 2010063016210200
Modified files:
poptCHANGES test1.c
popt/auto Makefile.am
Log:
Fixed the bug introduced with the correction of VPATH
It's time to go on the beach at least leave make distcheck
and make check and VPATH building working
Summary:
RevisionChanges Path
1.143 +1 -0 popt/CHANGES
1.6 +1 -1 popt/auto/Makefile.am
1.50+1 -4 popt/test1.c
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.142 -r1.143 CHANGES
--- popt/CHANGES 29 Jun 2010 10:47:57 - 1.142
+++ popt/CHANGES 30 Jun 2010 16:21:02 - 1.143
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+- Fixed VPATH building with arbitrary directory structure
- devzero2000: some minor fix to autofu and also a minor portability
problem on AIX
with the native compiler
- devzero2000: add malloc vodo to testit.sh
@@ .
patch -p0 <<'@@ .'
Index: popt/auto/Makefile.am
$ cvs diff -u -r1.5 -r1.6 Makefile.am
--- popt/auto/Makefile.am 30 Jun 2010 15:27:16 - 1.5
+++ popt/auto/Makefile.am 30 Jun 2010 16:21:02 - 1.6
@@ -1,4 +1,4 @@
-TDIRS = descriptors_storage header_compile_errors test_results tests
+TDIRS = descriptors_storage header_compile_errors test_results tests
logs
EXTRA_DIST = types
@@ .
patch -p0 <<'@@ .'
Index: popt/test1.c
$ cvs diff -u -r1.49 -r1.50 test1.c
--- popt/test1.c 30 Jun 2010 15:27:17 - 1.49
+++ popt/test1.c 30 Jun 2010 16:21:02 - 1.50
@@ -268,16 +268,13 @@
/*...@=modobserver@*/
/*...@-temptrans@*/
optCon = poptGetContext("test1", argc, argv, options, 0);
-/*...@=temptrans@*/
-(void) poptReadConfigFile(optCon, "./test-poptrc");
#ifdef HAVE_STDLIB_H
char * testpoptrc;
testpoptrc = getenv ("testpoptrc");
if (testpoptrc != NULL )
(void) poptReadConfigFile(optCon, testpoptrc);
-else
-printf("something go wrong\n");
#else
+(void) poptReadConfigFile(optCon, "./test-poptrc");
/* : make distcheck succed : test1 is in popt-/_build */
(void) poptReadConfigFile(optCon, "../../test-poptrc");
#endif
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ NEWS rpm/doc/manual/ Makefile.am autosignature
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 30-Jun-2010 18:34:05 Branch: HEAD Handle: 2010063016340202 Added files: rpm/doc/manual autosignature Modified files: rpm NEWS rpm/doc/manual Makefile.am Log: Update with (good) news the NEWS and add some (jbj) docu on the new RPM5.3 FEATURE: rpmbuild signs all packages with DSA Summary: RevisionChanges Path 2.19+7 -0 rpm/NEWS 1.8 +2 -1 rpm/doc/manual/Makefile.am 1.1 +79 -0 rpm/doc/manual/autosignature patch -p0 <<'@@ .' Index: rpm/NEWS $ cvs diff -u -r2.18 -r2.19 NEWS --- rpm/NEWS 2 Apr 2008 19:12:05 - 2.18 +++ rpm/NEWS 30 Jun 2010 16:34:02 - 2.19 @@ -5,6 +5,13 @@ This is a list of the major changes between RPM 4 and RPM 5. For more details please see the CHANGES file. + New in RPM 5.3 + -- + + o New Features: + +- All packages produced by rpmbuild now have a DSA pubkey/signature + New in RPM 5.1 -- @@ . patch -p0 <<'@@ .' Index: rpm/doc/manual/Makefile.am $ cvs diff -u -r1.7 -r1.8 Makefile.am --- rpm/doc/manual/Makefile.am20 Nov 2009 08:49:21 - 1.7 +++ rpm/doc/manual/Makefile.am30 Jun 2010 16:34:04 - 1.8 @@ -17,4 +17,5 @@ spec \ triggers \ tsort \ -newrpmdb.howto +newrpmdb.howto \ +autosignature @@ . patch -p0 <<'@@ .' Index: rpm/doc/manual/autosignature $ cvs diff -u -r0 -r1.1 autosignature --- /dev/null 2010-06-30 18:33:01.0 +0200 +++ autosignature 2010-06-30 18:34:05.052816122 +0200 @@ -0,0 +1,79 @@ +All packages produced by rpmbuild now have a DSA pubkey/signature. + +The reason for automagically signing all packages should be obvious: + All software distributed th=rough "packages" is subject to + malicious tampering. + Adding a signature to _ALL_ packages produced by rpmbuild is the first step + towards a MANDATORY policy of: + All packages installed by RPM MUST be signed. + +Clearly rpmbuild is forced to GUARANTEE that _SOME_ signature exists before +MANDATORY policy can be attempted. + +(aside) +Vendors might well understand the need for software package integrity checks +through digital signatures. Unfortunately the issues of "branding" (signified +by signing with the "official" vendor key) have gotten convolved with security +isssues because of common practice with RPM based distros. Absolutely one shouldn't +signify "official" release of software without due diligence and attention to +the myriad "business" details of QA testing and release notes and marketing and ... +... but that's no reason _NOT_ to sign *.rpm packages _ALWAYS_. + +(another aside) +And yes many vendors _ARE_ signing _ALL_ packages routinely. Unfortunately, the process +of making gigabyes of *.rpm plaintext available for public distribution on +very short time scales (like within 24 hours of being built) is quite complex, +and so mistakes (like unsigned packages) occur too frequently. + +That should make the reason for attempting automagic signing of all *.rpm +packages produced by rpmbuild clearer. If not, well, "Have it your own way!" +and do whatever you wish. + +The mechanism for the automagic signing is based on a "non-repudiable" +signature described in the "Handbook of Applied Crytography" section +13.8.2 p 582 which can be read online here: + + http://www.cacr.math.uwaterloo.ca/hac/about/chap13.pdf + +In plain speak here's what rpmbuild does (in rpm-5.3.2): + + 1) At the beginning of every invocation, rpmbuild generates a DSA keypair + (using BeeCrypt, the highest performing and only MANDATORY crypto implementation + available @rpm5.org). + + 2) When producing packages, the pubkey parameters are converted to RFC 2440/4880 + OpenPGP format and added to _ALL_ package headers in the (pre-existing) RPMTAG_PUBKEYS tag. + The pubkey is exactly an armored pubkey as produced by gnupg2 with no + additional s
[CVS] RPM: popt/ popt.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jul-2010 10:59:38
Branch: HEAD Handle: 2010072308593800
Modified files:
poptpopt.c
Log:
(style) reduce the scope of variables
drop cppcheck minor warn. if this is OK for the maintainer
I will apply it everywhere in popt and rpm. Let's see.
Summary:
RevisionChanges Path
1.152 +9 -8 popt/popt.c
patch -p0 <<'@@ .'
Index: popt/popt.c
$ cvs diff -u -r1.151 -r1.152 popt.c
--- popt/popt.c 21 Jun 2010 15:13:49 - 1.151
+++ popt/popt.c 23 Jul 2010 08:59:38 - 1.152
@@ -236,8 +236,6 @@
void poptResetContext(poptContext con)
{
-int i;
-
if (con == NULL) return;
while (con->os > con->optionStack) {
cleanOSE(con->os--);
@@ -253,11 +251,13 @@
con->restLeftover = 0;
con->doExec = NULL;
-if (con->av != NULL)
-for (i = 0; i < con->ac; i++) {
+if (con->av != NULL) {
+int i;
+ for (i = 0; i < con->ac; i++) {
/*...@-unqualifiedtrans@*/ /* FIX: typedef double indirection. */
- con->av[i] = _free(con->av[i]);
+ con->av[i] = _free(con->av[i]);
/*...@=unqualifiedtrans@*/
+ }
}
con->ac = 0;
@@ -1019,7 +1019,6 @@
const char ** av = NULL;
int ac = 0;
int xx;
-int i;
stk[ix++] = arg0;
@@ -1066,7 +1065,8 @@
xx = poptParseArgvString(s, &ac, &av); /* XXX split on CSV character
set. */
assert(!xx && av);
-if (av)
+if (av) {
+int i;
for (i = 0; av[i] != NULL; i++) {
const char * arg = av[i];
size_t len = strlen(arg);
@@ -1129,6 +1129,7 @@
}
}
}
+ }
if (ix-- < 1) {
rc = POPT_ERROR_STACKUNDERFLOW;
@@ -1458,7 +1459,6 @@
if (!con->os->nextCharArg) {
const char * origOptString = NULL;
const char * optString;
-size_t optStringLen;
int thisopt;
/*...@-sizeoftype@*/
@@ -1508,6 +1508,7 @@
} else {
unsigned int argInfo = 0;
const char *oe;
+size_t optStringLen;
optString++;
if (*optString == '-')
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ poptconfig.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jul-2010 15:18:00
Branch: HEAD Handle: 2010072313175900
Modified files:
poptpoptconfig.c
Log:
use x=_free(x) (the jbj transform) consistently
Summary:
RevisionChanges Path
1.52+10 -19 popt/poptconfig.c
patch -p0 <<'@@ .'
Index: popt/poptconfig.c
$ cvs diff -u -r1.51 -r1.52 poptconfig.c
--- popt/poptconfig.c 20 May 2009 13:18:07 - 1.51
+++ popt/poptconfig.c 23 Jul 2010 13:17:59 - 1.52
@@ -211,10 +211,8 @@
exit:
if (rc != 0) {
/*...@-usedef@*/
- if (b)
- free(b);
+ b=_free(b);
/*...@=usedef@*/
- b = NULL;
nb = 0;
}
if (bp)
@@ -383,8 +381,7 @@
/*...@=nullstate@*/
exit:
rc = 0; /* XXX for now, always return success */
-if (b)
- free(b);
+b=_free(b);
return rc;
}
/*...@=compmempass@*/
@@ -433,12 +430,11 @@
}
}
-free(t);
+t=_free(t);
rc = 0;
exit:
-if (b)
- free(b);
+ b=_free(b);
return rc;
}
@@ -481,16 +477,13 @@
xx = poptReadConfigFile(con, fn);
if (xx && rc == 0)
rc = xx;
- free((void *)av[i]);
- av[i] = NULL;
+ av[i]=_free((void *)av[i]);
}
- free(av);
- av = NULL;
+ av=_free(av);
}
/*...@-usedef@*/
-if (buf)
- free(buf);
+buf=_free(buf);
/*...@=usedef@*/
return rc;
@@ -530,11 +523,9 @@
continue;
}
rc = poptReadConfigFile(con, fn);
- free((void *)av[i]);
- av[i] = NULL;
+ av[i]=_free((void *)av[i]);
}
- free(av);
- av = NULL;
+ av=_free(av);
}
}
if (rc) goto exit;
@@ -545,7 +536,7 @@
if (fn != NULL) {
(void) stpcpy(stpcpy(fn, home), "/.popt");
rc = poptReadConfigFile(con, fn);
- free(fn);
+ fn=_free(fn);
} else
rc = POPT_ERROR_ERRNO;
if (rc) goto exit;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ poptconfig.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jul-2010 15:22:55
Branch: HEAD Handle: 2010072313225500
Modified files:
poptpoptconfig.c
Log:
(style) reduce the scope of variables. drop cppcheck minor warn
Summary:
RevisionChanges Path
1.53+5 -4 popt/poptconfig.c
patch -p0 <<'@@ .'
Index: popt/poptconfig.c
$ cvs diff -u -r1.52 -r1.53 poptconfig.c
--- popt/poptconfig.c 23 Jul 2010 13:17:59 - 1.52
+++ popt/poptconfig.c 23 Jul 2010 13:22:55 - 1.53
@@ -393,7 +393,6 @@
const char *se;
char *t, *te;
int rc;
-int xx;
if ((rc = poptReadFile(fn, &b, &nb, POPT_READFILE_TRIMNEWLINES)) != 0)
return (errno == ENOENT ? 0 : rc);
@@ -411,8 +410,10 @@
*te = '\0';
te = t;
while (*te && _isspaceptr(te)) te++;
- if (*te && *te != '#')
- xx = poptConfigLine(con, te);
+ if (*te && *te != '#') {
+int xx;
+ xx = poptConfigLine(con, te); /* XXX: unchecked */
+}
/*...@switchbreak@*/ break;
/*...@-usedef@*/ /* XXX *se may be uninitialized */
case '\\':
@@ -511,9 +512,9 @@
if (!stat("/etc/popt.d", &sb) && S_ISDIR(sb.st_mode)) {
const char ** av = NULL;
int ac = 0;
- int i;
if ((rc = poptGlob(con, "/etc/popt.d/*", &ac, &av)) == 0) {
+ int i;
for (i = 0; rc == 0 && i < ac; i++) {
const char * fn = av[i];
if (fn == NULL || strstr(fn, ".rpmnew") || strstr(fn,
".rpmsave"))
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ popthelp.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jul-2010 15:34:31
Branch: HEAD Handle: 2010072313343000
Modified files:
poptpopthelp.c
Log:
(style) reduce the scope of variables. drop cppcheck minor warn
Summary:
RevisionChanges Path
1.98+16 -13 popt/popthelp.c
patch -p0 <<'@@ .'
Index: popt/popthelp.c
$ cvs diff -u -r1.97 -r1.98 popthelp.c
--- popt/popthelp.c 18 Jun 2010 02:03:29 - 1.97
+++ popt/popthelp.c 23 Jul 2010 13:34:30 - 1.98
@@ -530,11 +530,11 @@
/*...@*/
{
size_t max = 0;
-size_t len = 0;
const char * argDescrip;
if (opt != NULL)
while (opt->longName || opt->shortName || opt->arg) {
+ size_t len = 0;
if (poptArgType(opt) == POPT_ARG_INCLUDE_TABLE) {
if (opt->arg) /* XXX program error */
len = maxArgWidth(opt->arg, translation_domain);
@@ -584,15 +584,16 @@
/*...@modifies fp, fileSystem @*/
{
poptItem item;
-int i;
-if (items != NULL)
+if (items != NULL) {
+int i;
for (i = 0, item = items; i < nitems; i++, item++) {
const struct poptOption * opt;
opt = &item->option;
if ((opt->longName || opt->shortName) && !F_ISSET(opt, DOC_HIDDEN))
singleOptionHelp(fp, columns, opt, translation_domain);
}
+ }
}
/**
@@ -612,7 +613,6 @@
{
const struct poptOption * opt;
const char *sub_transdom;
-int xx;
if (table == poptAliasOptions) {
itemHelp(fp, con->aliases, con->numAliases, columns, NULL);
@@ -637,8 +637,10 @@
/* If no popt aliases/execs, skip poptAliasOption processing. */
if (opt->arg == poptAliasOptions && !(con->numAliases || con->numExecs))
continue;
- if (opt->descrip)
- xx = POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
+ if (opt->descrip) {
+int xx;
+ xx = POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip)); /*
XXX: unchecked */
+}
singleTableHelp(con, fp, opt->arg, columns, sub_transdom);
}
@@ -770,17 +772,18 @@
/*...@globals fileSystem @*/
/*...@modifies fp, columns->cur, fileSystem @*/
{
-int i;
-if (item != NULL)
-for (i = 0; i < nitems; i++, item++) {
+if (item != NULL) {
+int i;
+ for (i = 0; i < nitems; i++, item++) {
const struct poptOption * opt;
opt = &item->option;
-if (poptArgType(opt) == POPT_ARG_INTL_DOMAIN) {
- translation_domain = (const char *)opt->arg;
+ if (poptArgType(opt) == POPT_ARG_INTL_DOMAIN) {
+ translation_domain = (const char *)opt->arg;
} else
- if ((opt->longName || opt->shortName) && !F_ISSET(opt, DOC_HIDDEN)) {
- columns->cur = singleOptionUsage(fp, columns, opt,
translation_domain);
+ if ((opt->longName || opt->shortName) && !F_ISSET(opt,
DOC_HIDDEN)) {
+ columns->cur = singleOptionUsage(fp, columns, opt,
translation_domain);
+ }
}
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ poptparse.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jul-2010 15:36:02
Branch: HEAD Handle: 2010072313360100
Modified files:
poptpoptparse.c
Log:
(style) reduce the scope of variables. drop cppcheck minor warn
Summary:
RevisionChanges Path
1.33+2 -1 popt/poptparse.c
patch -p0 <<'@@ .'
Index: popt/poptparse.c
$ cvs diff -u -r1.32 -r1.33 poptparse.c
--- popt/poptparse.c 18 Jun 2010 01:20:16 - 1.32
+++ popt/poptparse.c 23 Jul 2010 13:36:01 - 1.33
@@ -19,10 +19,11 @@
static const char ** poptArgvFree(/*...@only@*/ const char ** av)
{
#if !defined(SUPPORT_CONTIGUOUS_ARGV)
+if (av) {
int i;
-if (av)
for (i = 0; av[i]; i++)
av[i] = _free(av[i]);
+}
#endif
av = _free(av);
return NULL;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/m4/ popt.m4
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jul-2010 16:47:38
Branch: HEAD Handle: 2010072314473800
Added files:
popt/m4 popt.m4
Log:
added popt_CFLAGS_ADD macros
Summary:
RevisionChanges Path
1.1 +34 -0 popt/m4/popt.m4
patch -p0 <<'@@ .'
Index: popt/m4/popt.m4
$ cvs diff -u -r0 -r1.1 popt.m4
--- /dev/null 2010-07-23 16:46:09.0 +0200
+++ popt.m4 2010-07-23 16:47:38.841538463 +0200
@@ -0,0 +1,34 @@
+# popt.m4 serial 1
+dnl Copyright (C) Elia Pinto (devzero2...@rpm5.org)
+dnl Inspired from gnulib warning.m4 and other
+dnl but not from ac_archive
+
+
+# popt_AS_VAR_APPEND(VAR, VALUE)
+#
+# Provide the functionality of AS_VAR_APPEND if Autoconf does not have it.
+m4_ifdef([AS_VAR_APPEND],
+[m4_copy([AS_VAR_APPEND], [popt_AS_VAR_APPEND])],
+[m4_define([popt_AS_VAR_APPEND],
+[AS_VAR_SET([$1], [AS_VAR_GET([$1])$2])])])
+
+# popt_CFLAGS_ADD(PARAMETER, [VARIABLE = POPT_CFLAGS])
+#
+# Adds parameter to POPT_CFLAGS if the compiler supports it. For example,
+# popt_CFLAGS_ADD([-Wall],[POPT_CFLAGS]).
+AC_DEFUN([popt_CFLAGS_ADD],
+[AS_VAR_PUSHDEF([popt_my_cflags], [popt_cv_warn_$1])dnl
+AC_CACHE_CHECK([whether compiler handles $1], [popt_my_cflags], [
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="${CFLAGS} $1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+[AS_VAR_SET([popt_my_cflags], [yes])],
+[AS_VAR_SET([popt_my_cflags], [no])])
+ CFLAGS="$save_CFLAGS"
+])
+AS_VAR_PUSHDEF([popt_cflags], m4_if([$2], [], [[POPT_CFLAGS]], [[$2]]))dnl
+AS_VAR_IF([popt_my_cflags], [yes], [popt_AS_VAR_APPEND([popt_cflags], ["
$1"])])
+AS_VAR_POPDEF([popt_cflags])dnl
+AS_VAR_POPDEF([popt_my_cflags])dnl
+m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
+])
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ Makefile.am configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 23-Jul-2010 17:26:36 Branch: HEAD Handle: 2010072315263600 Modified files: poptMakefile.am configure.ac Log: add --enable-gcc-warnings configure option. Probably sometime useful Summary: RevisionChanges Path 1.66+4 -0 popt/Makefile.am 1.67+27 -0 popt/configure.ac patch -p0 <<'@@ .' Index: popt/Makefile.am $ cvs diff -u -r1.65 -r1.66 Makefile.am --- popt/Makefile.am 30 Jun 2010 15:27:17 - 1.65 +++ popt/Makefile.am 23 Jul 2010 15:26:36 - 1.66 @@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = -I. -I$(top_srcdir) +AM_CFLAGS = $(POPT_CFLAGS) EXTRA_DIST = lookup3.c autogen.sh CHANGES \ footer_no_timestamp.html libpopt.vers \ @@ -22,6 +23,9 @@ test1_CPPFLAGS = -I $(top_builddir) test2_CPPFLAGS = -I $(top_builddir) tdict_CPPFLAGS = -I $(top_builddir) +test1_CFLAGS = $(AM_CFLAGS) +test2_CFLAGS = $(AM_CFLAGS) +tdict_CFLAGS = $(AM_CFLAGS) test1_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) test2_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) tdict_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) @@ . patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.66 -r1.67 configure.ac --- popt/configure.ac 29 Jun 2010 10:47:57 - 1.66 +++ popt/configure.ac 23 Jul 2010 15:26:36 - 1.67 @@ -40,6 +40,33 @@ AC_PROG_INSTALL LT_INIT +# Turn gcc warning + +AC_ARG_ENABLE([gcc-warnings], + [AS_HELP_STRING([--enable-gcc-warnings], + [turn on GCC warnings (for developers)@<:@default=no@:>@])], + [case $enableval in + yes|no) ;; + *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;; + esac + popt_gcc_warnings=$enableval], + [popt_gcc_warnings=no] +) + +if test "$popt_gcc_warnings" = yes; then + # Add/Delete as needed + popt_CFLAGS_ADD([-Wall], [POPT_CFLAGS]) + popt_CFLAGS_ADD([-pedantic], [POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wextra], [POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wformat-y2k], [POPT_CFLAGS]) + popt_CFLAGS_ADD([-fdiagnostics-show-option],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-funit-at-a-time],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-fstrict-aliasing],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wstrict-overflow],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-fstrict-overflow],[POPT_CFLAGS]) + popt_CFLAGS_ADD([-Wpointer-arith],[POPT_CFLAGS]) + AC_SUBST([POPT_CFLAGS]) +fi # Checks for doxygen support. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 23-Jul-2010 17:59:26 Branch: HEAD Handle: 2010072315592600 Modified files: poptconfigure.ac Log: add the gcc security extension as rpm5 do Summary: RevisionChanges Path 1.68+10 -0 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.67 -r1.68 configure.ac --- popt/configure.ac 23 Jul 2010 15:26:36 - 1.67 +++ popt/configure.ac 23 Jul 2010 15:59:26 - 1.68 @@ -68,6 +68,16 @@ AC_SUBST([POPT_CFLAGS]) fi +# build RPM instrumented for extra optimization/security (GCC only) +# -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ +if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then +dnl # GNU GCC (usually "gcc") + for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions + do + popt_CFLAGS_ADD([$c], [POPT_CFLAGS]) + done + AC_SUBST([POPT_CFLAGS]) +fi # Checks for doxygen support. AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 23-Jul-2010 18:39:48 Branch: HEAD Handle: 2010072316394800 Modified files: poptconfigure.ac Log: use popt_CFLAGS_ADD everywhere drop the CFLAGS="$CFLAGS xx" assignaments everywhere. Also use AS_IF autoconf contruct if possible. Substitute also "rpm" with "popt" in the comment on the security cflags assignment. Summary: RevisionChanges Path 1.69+18 -15 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.68 -r1.69 configure.ac --- popt/configure.ac 23 Jul 2010 15:59:26 - 1.68 +++ popt/configure.ac 23 Jul 2010 16:39:48 - 1.69 @@ -31,7 +31,6 @@ AC_SUBST(LT_AGE, 8) -CFLAGS="$CFLAGS -D_REENTRANT" AC_PROG_CC AC_PROG_CC_STDC @@ -53,8 +52,8 @@ [popt_gcc_warnings=no] ) -if test "$popt_gcc_warnings" = yes; then - # Add/Delete as needed +AS_IF([test "x$popt_gcc_warnings" = xyes], + [ # Add/Delete as needed popt_CFLAGS_ADD([-Wall], [POPT_CFLAGS]) popt_CFLAGS_ADD([-pedantic], [POPT_CFLAGS]) popt_CFLAGS_ADD([-Wextra], [POPT_CFLAGS]) @@ -65,19 +64,22 @@ popt_CFLAGS_ADD([-Wstrict-overflow],[POPT_CFLAGS]) popt_CFLAGS_ADD([-fstrict-overflow],[POPT_CFLAGS]) popt_CFLAGS_ADD([-Wpointer-arith],[POPT_CFLAGS]) - AC_SUBST([POPT_CFLAGS]) -fi + ]) -# build RPM instrumented for extra optimization/security (GCC only) + +# build popt instrumented for extra optimization/security (GCC only) # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ -if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then -dnl # GNU GCC (usually "gcc") - for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions - do - popt_CFLAGS_ADD([$c], [POPT_CFLAGS]) - done - AC_SUBST([POPT_CFLAGS]) -fi +# GNU GCC (usually "gcc") +AS_IF([test "x$GCC" != x], + [ for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions + do + popt_CFLAGS_ADD([$c], [POPT_CFLAGS]) + done + ]) +# Misc CFLAGS +popt_CFLAGS_ADD([-D_REENTRANT], [POPT_CFLAGS]) +# Finally put an AC_SUBST for all the CFLAGS above +AC_SUBST([POPT_CFLAGS]) # Checks for doxygen support. AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN) @@ -115,7 +117,8 @@ [ if test "x$GCC" != x then -CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" +popt_CFLAGS_ADD([-fprofile-arcs -ftest-coverage], [POPT_CFLAGS]) +AC_SUBST([POPT_CFLAGS]) else LCOV=NO_LCOV fi @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ Makefile.am configure.ac popt/m4/ popt.m4
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 23-Jul-2010 20:01:28
Branch: HEAD Handle: 2010072318012601
Modified files:
poptMakefile.am configure.ac
popt/m4 popt.m4
Log:
add build-pie to autoconf
Summary:
RevisionChanges Path
1.67+2 -1 popt/Makefile.am
1.70+22 -0 popt/configure.ac
1.2 +21 -0 popt/m4/popt.m4
patch -p0 <<'@@ .'
Index: popt/Makefile.am
$ cvs diff -u -r1.66 -r1.67 Makefile.am
--- popt/Makefile.am 23 Jul 2010 15:26:36 - 1.66
+++ popt/Makefile.am 23 Jul 2010 18:01:26 - 1.67
@@ -3,6 +3,7 @@
ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I. -I$(top_srcdir)
AM_CFLAGS = $(POPT_CFLAGS)
+AM_LDFLAGS = $(POPT_LDFLAGS)
EXTRA_DIST = lookup3.c autogen.sh CHANGES \
footer_no_timestamp.html libpopt.vers \
@@ -40,7 +41,7 @@
usrlib_LTLIBRARIES = libpopt.la
libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ $(AM_LDFLAGS)
pkgconfigdir = $(prefix)/lib/pkgconfig
pkgconfig_DATA = popt.pc
@@ .
patch -p0 <<'@@ .'
Index: popt/configure.ac
$ cvs diff -u -r1.69 -r1.70 configure.ac
--- popt/configure.ac 23 Jul 2010 16:39:48 - 1.69
+++ popt/configure.ac 23 Jul 2010 18:01:26 - 1.70
@@ -67,6 +67,28 @@
])
+# build popt instrumented for -fPIE (GCC only)
+AC_ARG_ENABLE([build-pie],
+ [AS_HELP_STRING([--enable-build-pie],
+ [build POPT as Position Independent Executable (PIE)
(@<:@default=yes@:>@ with GCC only)])],
+ [case $enableval in
+ yes|no) ;;
+ *) AC_MSG_ERROR([bad value $enableval for build-pie option]) ;;
+ esac
+ popt_gcc_pie=$enableval],
+ [popt_gcc_pie=yes]
+)
+AS_IF([test "x$popt_gcc_pie" = xyes],
+ [
+AS_IF([test "x$GCC" != x],
+ [ popt_CFLAGS_ADD([-fpie], [POPT_CFLAGS])
+popt_LDFLAGS_ADD([-pie], [POPT_LDFLAGS])
+ ],
+ [ AC_MSG_WARN([--enable-build-pie requires GCC])]
+)
+ ])
+AC_SUBST([POPT_LDFLAGS])
+
# build popt instrumented for extra optimization/security (GCC only)
# -fno-delete-null-pointer as the kernel does
http://patchwork.kernel.org/patch/36060/
# GNU GCC (usually "gcc")
@@ .
patch -p0 <<'@@ .'
Index: popt/m4/popt.m4
$ cvs diff -u -r1.1 -r1.2 popt.m4
--- popt/m4/popt.m4 23 Jul 2010 14:47:38 - 1.1
+++ popt/m4/popt.m4 23 Jul 2010 18:01:27 - 1.2
@@ -32,3 +32,24 @@
AS_VAR_POPDEF([popt_my_cflags])dnl
m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
])
+
+# popt_LDFLAGS_ADD(PARAMETER, [VARIABLE = POPT_LDFLAGS])
+#
+# Adds parameter to POPT_LDFLAGS if the compiler supports it. For example,
+# popt_LDFLAGS_ADD([-Wall],[POPT_LDFLAGS]).
+AC_DEFUN([popt_LDFLAGS_ADD],
+[AS_VAR_PUSHDEF([popt_my_ldflags], [popt_cv_warn_$1])dnl
+AC_CACHE_CHECK([whether compiler handles $1], [popt_my_ldflags], [
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="${LDFLAGS} $1"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([])],
+[AS_VAR_SET([popt_my_ldflags], [yes])],
+[AS_VAR_SET([popt_my_ldflags], [no])])
+ LDFLAGS="$save_LDFLAGS"
+])
+AS_VAR_PUSHDEF([popt_ldflags], m4_if([$2], [], [[POPT_LDFLAGS]], [[$2]]))dnl
+AS_VAR_IF([popt_my_ldflags], [yes], [popt_AS_VAR_APPEND([popt_ldflags], ["
$1"])])
+AS_VAR_POPDEF([popt_ldflags])dnl
+AS_VAR_POPDEF([popt_my_ldflags])dnl
+m4_ifval([$2], [AS_LITERAL_IF([$2], [AC_SUBST([$2])], [])])dnl
+])
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ test1.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 26-Jul-2010 18:23:41
Branch: HEAD Handle: 2010072616234100
Modified files:
popttest1.c
Log:
fix again test1.c for running testit.sh alone
Summary:
RevisionChanges Path
1.51+5 -0 popt/test1.c
patch -p0 <<'@@ .'
Index: popt/test1.c
$ cvs diff -u -r1.50 -r1.51 test1.c
--- popt/test1.c 30 Jun 2010 16:21:02 - 1.50
+++ popt/test1.c 26 Jul 2010 16:23:41 - 1.51
@@ -273,6 +273,11 @@
testpoptrc = getenv ("testpoptrc");
if (testpoptrc != NULL )
(void) poptReadConfigFile(optCon, testpoptrc);
+else {
+(void) poptReadConfigFile(optCon, "./test-poptrc");
+/* : make distcheck succed : test1 is in popt-/_build */
+(void) poptReadConfigFile(optCon, "../../test-poptrc");
+}
#else
(void) poptReadConfigFile(optCon, "./test-poptrc");
/* : make distcheck succed : test1 is in popt-/_build */
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES Makefile.am configure.ac popt-vg.supp testit....
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 26-Jul-2010 18:46:33
Branch: HEAD Handle: 2010072616463200
Added files:
poptpopt-vg.supp
Modified files:
poptCHANGES Makefile.am configure.ac testit.sh
Log:
added --enable-valgrind autoconf option
Summary:
RevisionChanges Path
1.144 +1 -0 popt/CHANGES
1.68+5 -2 popt/Makefile.am
1.71+28 -0 popt/configure.ac
1.1 +163 -0 popt/popt-vg.supp
1.35+7 -2 popt/testit.sh
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.143 -r1.144 CHANGES
--- popt/CHANGES 30 Jun 2010 16:21:02 - 1.143
+++ popt/CHANGES 26 Jul 2010 16:46:32 - 1.144
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+- devzero2000: added --enable-valgrind autoconf option
- Fixed VPATH building with arbitrary directory structure
- devzero2000: some minor fix to autofu and also a minor portability
problem on AIX
with the native compiler
@@ .
patch -p0 <<'@@ .'
Index: popt/Makefile.am
$ cvs diff -u -r1.67 -r1.68 Makefile.am
--- popt/Makefile.am 23 Jul 2010 18:01:26 - 1.67
+++ popt/Makefile.am 26 Jul 2010 16:46:32 - 1.68
@@ -32,7 +32,10 @@
tdict_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES)
TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir)
testpoptrc="$(top_srcdir)/test-poptrc" PATH=.:../src:$$PATH \
- $(SHELL)
+$(VALGRIND_ENVIRONMENT) \
+ $(SHELL)
+
+
TESTS = $(top_builddir)/testit.sh
include_HEADERS = popt.h
@@ -58,7 +61,7 @@
rm -rf .ccache
clean-local:
- rm -rf doxygen *.gcda *.gcno lcov-result
+ rm -rf doxygen *.gcda *.gcno lcov-result popt-valgrind-result
if HAVE_SPLINT
lint:
@@ .
patch -p0 <<'@@ .'
Index: popt/configure.ac
$ cvs diff -u -r1.70 -r1.71 configure.ac
--- popt/configure.ac 23 Jul 2010 18:01:26 - 1.70
+++ popt/configure.ac 26 Jul 2010 16:46:32 - 1.71
@@ -103,6 +103,34 @@
# Finally put an AC_SUBST for all the CFLAGS above
AC_SUBST([POPT_CFLAGS])
+# Support for running test cases using valgrind:
+
+use_valgrind=false
+VALGRIND_ENVIRONMENT=""
+AC_ARG_ENABLE(valgrind,
+[ --enable-valgrind Use valgrind when running unit tests. ],
+[ use_valgrind=true ])
+
+AS_IF([ test x"$use_valgrind" = x"true" ],
+ [
+AC_CHECK_PROG(HAVE_VALGRIND, valgrind, yes, no)
+AS_IF([ test x$HAVE_VALGRIND = no ],
+ [
+AC_MSG_ERROR([You have asked for Valgrind support but
Valgrind not found in PATH. ])
+ ],
+ [
+ AS_IF([ test x$enable_shared = xyes ],
+[
+ VALGRIND_ENVIRONMENT="libtool --mode=execute "
+]
+ )
+ VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q
--error-exitcode=3 --leak-check=yes --leak-check=full
--log-file=popt-valgrind-result --suppressions=\$(srcdir)/popt-vg.supp "
+ AC_SUBST([VALGRIND_ENVIRONMENT])
+ ])
+ ])
+
+AM_CONDITIONAL([USE_VALGRIND], [test x$use_valgrind != no])
+
# Checks for doxygen support.
AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN)
AC_ARG_ENABLE(doxygen,
@@ .
patch -p0 <<'@@ .'
Index: popt/popt-vg.supp
$ cvs diff -u -r0 -r1.1 popt-vg.supp
--- /dev/null 2010-07-26 18:46:32.0 +0200
+++ popt-vg.supp 2010-07-26 18:46:33.633853726 +0200
@@ -0,0 +1,163 @@
+{
+ bashMemLeak1
+ Memcheck:Leak
+ fun:malloc
+ fun:xmalloc
+ fun:execute_command_internal
+ fun:parse_and_execute
+ fun:command_substitute
+ obj:/bin/bash
+ obj:/bin/bash
+ fun:expand_word_unsplit
+ obj:/bin/bash
+ fun:execute_command_internal
+ fun:execute_command
+ fun:execute_command_internal
+}
+{
+ bashMemLeak2
+ Memcheck:Leak
+ fun:malloc
+ fun:xmalloc
+ fun:execute_command_internal
+ fun:execut
[CVS] RPM: popt/ testit.sh
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 26-Jul-2010 18:51:22
Branch: HEAD Handle: 2010072616512100
Modified files:
popttestit.sh
Log:
Remove the rubbish left
Summary:
RevisionChanges Path
1.36+0 -1 popt/testit.sh
patch -p0 <<'@@ .'
Index: popt/testit.sh
$ cvs diff -u -r1.35 -r1.36 testit.sh
--- popt/testit.sh26 Jul 2010 16:46:32 - 1.35
+++ popt/testit.sh26 Jul 2010 16:51:21 - 1.36
@@ -57,7 +57,6 @@
cd ${srcdir}
test1=${builddir}/test1
echo "Running tests in `pwd`"
-[ x${VALGRIND_ENVIRONMENT} != x ] && echo "Under Valgrind with parameter
$VALGRIND_ENVIRONMENT"
#make -q testcases
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 26-Jul-2010 19:17:19 Branch: HEAD Handle: 2010072617171800 Modified files: poptconfigure.ac Log: Fix: missing builddir var dir for the destination Valgrind log. Summary: RevisionChanges Path 1.72+1 -1 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.71 -r1.72 configure.ac --- popt/configure.ac 26 Jul 2010 16:46:32 - 1.71 +++ popt/configure.ac 26 Jul 2010 17:17:18 - 1.72 @@ -124,7 +124,7 @@ VALGRIND_ENVIRONMENT="libtool --mode=execute " ] ) - VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --error-exitcode=3 --leak-check=yes --leak-check=full --log-file=popt-valgrind-result --suppressions=\$(srcdir)/popt-vg.supp " + VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --error-exitcode=3 --leak-check=yes --leak-check=full --log-file=\$(builddir)/popt-valgrind-result --suppressions=\$(srcdir)/popt-vg.supp " AC_SUBST([VALGRIND_ENVIRONMENT]) ]) ]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 28-Jul-2010 16:00:51 Branch: HEAD Handle: 2010072814004900 Modified files: poptMakefile.am Log: fixup popt pkgconfig destination for multiarch install Summary: RevisionChanges Path 1.69+1 -1 popt/Makefile.am patch -p0 <<'@@ .' Index: popt/Makefile.am $ cvs diff -u -r1.68 -r1.69 Makefile.am --- popt/Makefile.am 26 Jul 2010 16:46:32 - 1.68 +++ popt/Makefile.am 28 Jul 2010 14:00:49 - 1.69 @@ -46,7 +46,7 @@ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ $(AM_LDFLAGS) -pkgconfigdir = $(prefix)/lib/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = popt.pc if HAVE_LD_VERSION_SCRIPT @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ .cvsignore .gitignore Makefile.am popt/build-aux/ .cv...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 30-Jul-2010 15:58:56 Branch: HEAD Handle: 2010073013585600 Added files: popt.gitignore popt/build-aux .cvsignore Modified files: popt.cvsignore Makefile.am Log: drop useless abs path in Makefile.am. Added .gitignore for git hub clone. Update/added .cvsignore Summary: RevisionChanges Path 1.30+3 -0 popt/.cvsignore 1.1 +53 -0 popt/.gitignore 1.70+1 -1 popt/Makefile.am 1.1 +8 -0 popt/build-aux/.cvsignore patch -p0 <<'@@ .' Index: popt/.cvsignore $ cvs diff -u -r1.29 -r1.30 .cvsignore --- popt/.cvsignore 29 Jun 2010 08:34:25 - 1.29 +++ popt/.cvsignore 30 Jul 2010 13:58:56 - 1.30 @@ -11,6 +11,7 @@ autom4te* build build-aux +build-aux clang config.cache config.guess @@ -50,3 +51,5 @@ *.swp popt.pc popt-*.tar.gz +.git +.gitignore @@ . patch -p0 <<'@@ .' Index: popt/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-07-30 15:55:01.0 +0200 +++ .gitignore2010-07-30 15:58:56.394731684 +0200 @@ -0,0 +1,53 @@ +.ccache +.deps +.depend +.libs +ABOUT-NLS +ChangeLog +Doxyfile +Makefile +Makefile.in +aclocal.m4 +autom4te* +build +build-aux +clang +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.status +config.sub +configure +doxygen +depcomp +install-sh +intl +lconv +libtool +ltconfig +ltmain.sh +m4 +missing +mkinstalldirs +popt.spec +stamp-h +stamp-h1 +stamp-h.in +tdict +test-poptrc +test1 +test2 +test3 +test?-test?.o +*.gcda +*.gcno +*.la +*.lcd +*.lo +*.swp +popt.pc +popt-*.tar.gz +.cvsignore @@ . patch -p0 <<'@@ .' Index: popt/Makefile.am $ cvs diff -u -r1.69 -r1.70 Makefile.am --- popt/Makefile.am 28 Jul 2010 14:00:49 - 1.69 +++ popt/Makefile.am 30 Jul 2010 13:58:56 - 1.70 @@ -36,7 +36,7 @@ $(SHELL) -TESTS = $(top_builddir)/testit.sh +TESTS = testit.sh include_HEADERS = popt.h @@ . patch -p0 <<'@@ .' Index: popt/build-aux/.cvsignore $ cvs diff -u -r0 -r1.1 .cvsignore --- /dev/null 2010-07-30 15:55:01.0 +0200 +++ .cvsignore2010-07-30 15:58:56.684747498 +0200 @@ -0,0 +1,8 @@ +config.guess +config.rpath +config.sub +CVS +depcomp +install-sh +ltmain.sh +missing @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/build-aux/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 30-Jul-2010 16:02:09 Branch: HEAD Handle: 2010073014020800 Modified files: popt/build-aux .cvsignore Log: typo Summary: RevisionChanges Path 1.2 +0 -1 popt/build-aux/.cvsignore patch -p0 <<'@@ .' Index: popt/build-aux/.cvsignore $ cvs diff -u -r1.1 -r1.2 .cvsignore --- popt/build-aux/.cvsignore 30 Jul 2010 13:58:56 - 1.1 +++ popt/build-aux/.cvsignore 30 Jul 2010 14:02:08 - 1.2 @@ -1,7 +1,6 @@ config.guess config.rpath config.sub -CVS depcomp install-sh ltmain.sh @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/rpmio/ Makefile.am rpmtpm.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 09-Aug-2010 13:45:07 Branch: HEAD Handle: 2010080911450501 Modified files: rpm configure.ac rpm/rpmio Makefile.am rpmtpm.c Log: Honor the -without-tpm configure option Summary: RevisionChanges Path 2.445 +5 -1 rpm/configure.ac 1.282 +6 -1 rpm/rpmio/Makefile.am 1.4 +3 -0 rpm/rpmio/rpmtpm.c patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.444 -r2.445 configure.ac --- rpm/configure.ac 31 Jul 2010 19:00:03 - 2.444 +++ rpm/configure.ac 9 Aug 2010 11:45:05 - 2.445 @@ -1253,7 +1253,11 @@ [tpm], [TPM_Init], [tpm.h], [no,external:none], [], [ AC_DEFINE(WITH_TPM, 1, [Define if building with IBM TPM 1.2 emulator]) -], []) + AM_CONDITIONAL([WITH_TPM], [true]) +],[ + AM_CONDITIONAL([WITH_TPM], [false]) + ]) + dnl # select default Cryptography implementation to use (default for CLI option --usecrypto) AC_ARG_WITH([usecrypto], @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.281 -r1.282 Makefile.am --- rpm/rpmio/Makefile.am 24 Jul 2010 18:05:50 - 1.281 +++ rpm/rpmio/Makefile.am 9 Aug 2010 11:45:05 - 1.282 @@ -19,9 +19,12 @@ rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \ rpmpbzip2 rpmpigz rpmtar rpmz \ tasn tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \ - tperl tpython tput tpw trpmio tsexp tsw ttcl ttpm \ + tperl tpython tput tpw trpmio tsexp tsw ttcl \ dumpasn1 lookup3 +if WITH_TPM +EXTRA_PROGRAMS += ttpm +endif bin_PROGRAMS = man_MANS = @@ -382,8 +385,10 @@ ttcl_SOURCES = ttcl.c ttcl_LDADD = $(RPMIO_LDADD_COMMON) -ltcl +if WITH_TPM ttpm_SOURCES = ttpm.c ttpm_LDADD = $(RPMIO_LDADD_COMMON) +endif dumpasn1_SOURCES = dumpasn1.c dumpasn1_LDFLAGS = $(RPMIO_LDADD_COMMON) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmtpm.c $ cvs diff -u -r1.3 -r1.4 rpmtpm.c --- rpm/rpmio/rpmtpm.c25 Jul 2010 15:00:38 - 1.3 +++ rpm/rpmio/rpmtpm.c9 Aug 2010 11:45:06 - 1.4 @@ -28,6 +28,7 @@ /*...@unchecked@*/ int _rpmtpm_debug = -1; +#if defined(WITH_TPM) static int rpmtpmErr(rpmtpm tpm, const char * msg, uint32_t rc) /*...@*/ @@ -72,6 +73,7 @@ /*==*/ +#endif /*...@-mustmod@*//* XXX splint on crack */ static void rpmtpmFini(void * _tpm) /*...@globals fileSystem @*/ @@ -88,6 +90,7 @@ /*...@unchecked@*/ /*...@only@*/ /*...@null@*/ rpmioPool _rpmtpmPool = NULL; + static rpmtpm rpmtpmGetPool(/*...@null@*/ rpmioPool pool) /*...@globals _rpmtpmPool, fileSystem @*/ /*...@modifies pool, _rpmtpmPool, fileSystem @*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ .gitignore rpm/build/ .gitignore rpm/po/ .gitignore rp...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 09-Aug-2010 13:57:19 Branch: HEAD Handle: 2010080911571701 Added files: rpm/build .gitignore rpm/po .gitignore rpm/rpmio .gitignore rpm/tools .gitignore Modified files: rpm .gitignore Log: add some .gitignore Summary: RevisionChanges Path 1.2 +5 -0 rpm/.gitignore 1.1 +12 -0 rpm/build/.gitignore 1.1 +16 -0 rpm/po/.gitignore 1.1 +57 -0 rpm/rpmio/.gitignore 1.1 +50 -0 rpm/tools/.gitignore patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r1.1 -r1.2 .gitignore --- rpm/.gitignore27 Nov 2009 16:07:04 - 1.1 +++ rpm/.gitignore9 Aug 2010 11:57:17 - 1.2 @@ -51,3 +51,8 @@ rpm-*.tar.gz ylwrap CVS +*.o +*.lo +*.la +*.in + @@ . patch -p0 <<'@@ .' Index: rpm/build/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:18.134070558 +0200 @@ -0,0 +1,12 @@ +.created +.deps +.depend +Makefile +Makefile.in +.libs +*.gcda +*.gcno +*.la +*.lcd +*.lo +tfr @@ . patch -p0 <<'@@ .' Index: rpm/po/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:18.424086285 +0200 @@ -0,0 +1,16 @@ +ChangeLog +Makefile +Makefile.in +Makefile.in.in +Makevars.template +POTFILES +Rules-quot +stamp-cat-id +stamp-po +cat-id-tbl.c +LINGUAS +*.header +*.mo +*.gmo +*.sed +*.sin @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:18.724100955 +0200 @@ -0,0 +1,57 @@ +.created +.gnupg +.deps +.depend +Makefile +Makefile.in +.libs +*.gcda +*.gcno +*.la +*.lcd +*.lo +dumpasn1 +gengpg.h +getdate.c +lcov +lookup3 +bsdiff +bspatch +rpmborg +rpmgrep +rpmcpio +rpmcurl +rpmdigest +rpmdpkg +rpmgenpkglist +rpmgensrclist +rpmgpg +rpmpbzip2 +rpmpigz +rpmtar +rpmwget +rpmz +teststderr +testtry +tasn +tdigest +tdir +tfts +tget +tglob +thkp +tinv +tkey +tmacro +tmagic +tmire +tperl +tput +tpw +tpython +tring +trpmio +truby +tsexp +tsw +ttcl @@ . patch -p0 <<'@@ .' Index: rpm/tools/.gitignore $ cvs diff -u -r0 -r1.1 .gitignore --- /dev/null 2010-08-09 13:55:01.0 +0200 +++ .gitignore2010-08-09 13:57:19.044117143 +0200 @@ -0,0 +1,50 @@ +.deps +.depend +Makefile +Makefile.in +.libs +*.gcda +*.gcno +augtool +chroot +convertdb1 +cp +cudftool +db_sql_codegen +db_tool +dbsql +debugedit +find +grep +mtree +nix-build +nix-channel +nix-collect-garbage +nix-copy-closure +nix-env +nix-hash +nix-install-package +nix-instantiate +nix-log2xml +nix-prefetch-url +nix-pull +nix-push +nix-store +nix-worker +rpm2cpio +rpmcache +rpmcmp +rpmdeps +rpmdigest +rpmkey +rpmrepo +rpmspecdump +sandbox +semodule +spooktool +sqlite3 +txar +wget +xiu-echo +xiu-instantiate +xiu-store @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/macros/ macros.in rpm/rpmio/ rpmnss.c rpmpgp.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 10-Aug-2010 12:46:40
Branch: HEAD Handle: 2010081010463901
Modified files:
rpm/macros macros.in
rpm/rpmio rpmnss.c rpmpgp.c
Log:
Patch for to FIPS 140-2 @rpm5.org crypto stack validation
Based on a original patch from Jeff Johnson for rpm 5.1.9
Slightly revised for 5.3 HEAD branch
Submitted by: jbj
Summary:
RevisionChanges Path
1.30+3 -1 rpm/macros/macros.in
1.39+8 -0 rpm/rpmio/rpmnss.c
2.124 +2 -2 rpm/rpmio/rpmpgp.c
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.29 -r1.30 macros.in
--- rpm/macros/macros.in 21 May 2010 03:16:15 - 1.29
+++ rpm/macros/macros.in 10 Aug 2010 10:46:39 - 1.30
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.29 2010/05/21 03:16:15 jbj Exp $
+# $Id: macros.in,v 1.30 2010/08/10 10:46:39 devzero2000 Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -502,6 +502,8 @@
%_hkp_keyserver hkp://keys.rpm5.org
%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
+
+%_nssdb_path /etc/pki/nssdb
#==
# Transaction macros.
#Macro(s) used to parameterize transactions.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmnss.c
$ cvs diff -u -r1.38 -r1.39 rpmnss.c
--- rpm/rpmio/rpmnss.c9 Jun 2010 19:19:44 - 1.38
+++ rpm/rpmio/rpmnss.c10 Aug 2010 10:46:40 - 1.39
@@ -3,6 +3,7 @@
*/
#include "system.h"
+#include
#include
#define _RPMPGP_INTERNAL
@@ -10,6 +11,7 @@
#define _RPMNSS_INTERNAL
#include
#endif
+#include
#include "debug.h"
@@ -1258,10 +1260,16 @@
/*...@modifies _rpmnss_init @*/
{
rpmnss nss = xcalloc(1, sizeof(*nss));
+const char * _nssdb_path = rpmExpand("%{?_nssdb_path}", NULL);
/*...@-moduncon@*/
+if (_nssdb_path != NULL && *_nssdb_path == '/')
+ (void) NSS_Init(_nssdb_path);
+else
(void) NSS_NoDB_Init(NULL);
/*...@=moduncon@*/
+_nssdb_path = _free(_nssdb_path);
+
_rpmnss_init = 1;
return (void *) nss;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpgp.c
$ cvs diff -u -r2.123 -r2.124 rpmpgp.c
--- rpm/rpmio/rpmpgp.c23 Jun 2010 06:47:29 - 2.123
+++ rpm/rpmio/rpmpgp.c10 Aug 2010 10:46:40 - 2.124
@@ -47,12 +47,12 @@
#elif defined(USE_CRYPTO_TOMCRYPT) && defined(WITH_TOMCRYPT)
&rpmltcImplVecs;
/* implict selection (order DOES matter) */
+#elif defined(WITH_NSS)
+ &rpmnssImplVecs;
#elif defined(WITH_BEECRYPT)
&rpmbcImplVecs;
#elif defined(WITH_GCRYPT)
&rpmgcImplVecs;
-#elif defined(WITH_NSS)
- &rpmnssImplVecs;
#elif defined(WITH_SSL)
&rpmsslImplVecs;
#elif defined(WITH_CDSA)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ autogen.sh
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 10-Aug-2010 19:37:32
Branch: HEAD Handle: 2010081017373200
Modified files:
poptautogen.sh
Log:
new autogen.sh for checking the minimun version required of the autofu tool
I hope there is a better solution, but for now I have no clue.
Summary:
RevisionChanges Path
1.20+129 -9 popt/autogen.sh
patch -p0 <<'@@ .'
Index: popt/autogen.sh
$ cvs diff -u -r1.19 -r1.20 autogen.sh
--- popt/autogen.sh 29 Jun 2010 10:47:57 - 1.19
+++ popt/autogen.sh 10 Aug 2010 17:37:32 - 1.20
@@ -1,13 +1,133 @@
#!/bin/sh
-libtoolize=`which glibtoolize 2>/dev/null`
-case $libtoolize in
-/*) ;;
-*) libtoolize=`which libtoolize 2>/dev/null`
-case $libtoolize in
-/*) ;;
-*) libtoolize=libtoolize
-esac
-esac
+# $Id: autogen.sh,v 1.20 2010/08/10 17:37:32 devzero2000 Exp $
+# autogen.sh: autogen.sh script for popt projects
+#
+# Copyright (c) 2010-2011 Elia Pinto
+#
+# This program have the same copyright notice as popt
+# itself
+#
+
+
+# Guess whether we are using configure.ac or configure.in
+if test -f configure.ac; then
+ conffile="configure.ac"
+elif test -f configure.in; then
+ conffile="configure.in"
+else
+ echo "$0: could not find configure.ac or configure.in"
+ exit 1
+fi
+
+# Version Used for building
+#
+# Check for needed features
+libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo
yes || echo no`"
+libtool2="`grep '^[ \t]*LT_INIT' $conffile >/dev/null 2>&1 && echo yes ||
echo no`"
+
+# Check for automake
+am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e
's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
+if test -z "$am_version"; then
+ echo "$0: automake not found."
+ echo "You need automake version 1.11 or newer installed"
+ exit 1
+fi
+IFS=_; set $am_version; IFS=' '
+am_version=$1
+IFS=.; set $am_version; IFS=' '
+# automake 1.11 or newer
+if test "$1" = "1" -a "$2" -lt "11"; then
+ echo "$0: automake version $am_version found."
+ echo "You need automake version 1.11 or newer installed"
+ exit 1
+fi
+# Check for autoconf
+ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e
's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
+if test -z "$ac_version"; then
+ echo "$0: autoconf not found."
+ echo "You need autoconf version 2.63 or newer installed"
+ exit 1
+fi
+IFS=_; set $ac_version; IFS=' '
+ac_version=$1
+IFS=.; set $ac_version; IFS=' '
+# autoconf 2.63 or newer
+if test "$1" = "2" -a "$2" -lt "63" || test "$1" -lt "2"; then
+ echo "$0: autoconf version $ac_version found."
+ echo "You need autoconf version 2.63 or newer installed"
+ exit 1
+fi
+# Libtool
+if [ "$libtool" = "yes" -o "$libtool2" = "yes" ]
+then
+ libtoolize=`which glibtoolize 2>/dev/null`
+ case $libtoolize in
+ /*) ;;
+ *) libtoolize=`which libtoolize 2>/dev/null`
+ case $libtoolize in
+ /*) ;;
+ *) libtoolize=libtoolize
+ esac
+ esac
+ if test -z "$libtoolize"; then
+ echo "$0: libtool not found."
+ fi
+fi
+# Check for libtool 1.15.14 or newer if used
+if test "$libtool" = "yes"; then
+ lt_pversion=`${LIBTOOL:-libtool} --version 2>/dev/null|sed -e
's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
+ if test -z "$lt_pversion"; then
+ echo "$0: libtool not found."
+ echo "You need libtool version 1.5.14 or newer installed"
+ exit 1
+ fi
+ lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+ IFS=.; set $lt_version; IFS=' '
+ lt_status="good"
+ if test -z "$1"; then a=0 ; else a=$1;fi
+ if test -z "$2"; then b=0 ; else b=$2;fi
+ if test -z "$3"; then c=0 ; else c=
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 12-Aug-2010 14:06:54
Branch: HEAD Handle: 2010081212065300
Modified files:
poptconfigure.ac
Log:
dropped useless AM_COND_IF
Summary:
RevisionChanges Path
1.73+0 -5 popt/configure.ac
patch -p0 <<'@@ .'
Index: popt/configure.ac
$ cvs diff -u -r1.72 -r1.73 configure.ac
--- popt/configure.ac 26 Jul 2010 17:17:18 - 1.72
+++ popt/configure.ac 12 Aug 2010 12:06:53 - 1.73
@@ -148,7 +148,6 @@
fi],
[DOXYGEN_ENABLE=yes])
AM_CONDITIONAL([DOXYGEN_ENABLE], [test x$DOXYGEN != xNO_DOXYGEN])
-AM_COND_IF([DOXYGEN_ENABLE],[AC_SUBST([DOXYGEN],"$DOXYGEN")])
# Define for popt_sysconfig
popt_sysconfdir="${sysconfdir}"
@@ -174,20 +173,16 @@
fi
])
AM_CONDITIONAL([HAVE_LCOV], [test x$LCOV != xNO_LCOV])
-AM_COND_IF([HAVE_LCOV],[AC_SUBST([LCOV],"$LCOV")])
# Check for api-sanity-autotest.pl Makefile conditional support for
check-local
AC_PATH_PROG(API_SANITY_AUTOTEST,api-sanity-autotest.pl,NO_API_SANITY_AUTOTEST)
AM_CONDITIONAL([HAVE_API_SANITY_AUTOTEST], [test "x$API_SANITY_AUTOTEST" !=
xNO_API_SANITY_AUTOTEST])
-AM_COND_IF([HAVE_API_SANITY_AUTOTEST],[AC_SUBST([API_SANITY_AUTOTEST],"$API_SANITY_AUTOTEST")])
# Check for splint Makefile conditional support
AC_PATH_PROG(SPLINT,splint,NO_SPLINT)
AM_CONDITIONAL([HAVE_SPLINT],[test "x$SPLINT" != xNO_SPLINT])
-AM_COND_IF([HAVE_SPLINT],[AC_SUBST([SPLINT],"$SPLINT")])
# Check for mccabe makefile conditional support
AC_PATH_PROG(MCCABE,pmccabe,NO_MCCABE)
AM_CONDITIONAL([HAVE_MCCABE],[test "x$MCCABE" != xNO_MCCABE])
-AM_COND_IF([HAVE_MCCABE],[AC_SUBST([MCCABE],"$MCCABE")])
# Checks for libraries.
# Checks for header files.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ autogen.sh configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 12-Aug-2010 18:56:37
Branch: HEAD Handle: 2010081216563700
Modified files:
poptautogen.sh configure.ac
Log:
revert to libtool 1.x macros. Drop the libtool version control in
autogen.sh
Summary:
RevisionChanges Path
1.21+10 -71 popt/autogen.sh
1.74+1 -1 popt/configure.ac
patch -p0 <<'@@ .'
Index: popt/autogen.sh
$ cvs diff -u -r1.20 -r1.21 autogen.sh
--- popt/autogen.sh 10 Aug 2010 17:37:32 - 1.20
+++ popt/autogen.sh 12 Aug 2010 16:56:37 - 1.21
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: autogen.sh,v 1.20 2010/08/10 17:37:32 devzero2000 Exp $
+# $Id: autogen.sh,v 1.21 2010/08/12 16:56:37 devzero2000 Exp $
# autogen.sh: autogen.sh script for popt projects
#
# Copyright (c) 2010-2011 Elia Pinto
@@ -21,9 +21,6 @@
# Version Used for building
#
-# Check for needed features
-libtool="`grep '^[ \t]*A._PROG_LIBTOOL' $conffile >/dev/null 2>&1 && echo
yes || echo no`"
-libtool2="`grep '^[ \t]*LT_INIT' $conffile >/dev/null 2>&1 && echo yes ||
echo no`"
# Check for automake
am_version=`${AUTOMAKE:-automake} --version 2>/dev/null|sed -e
's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'`
@@ -58,75 +55,17 @@
exit 1
fi
# Libtool
-if [ "$libtool" = "yes" -o "$libtool2" = "yes" ]
-then
- libtoolize=`which glibtoolize 2>/dev/null`
- case $libtoolize in
+libtoolize=`which glibtoolize 2>/dev/null`
+case $libtoolize in
/*) ;;
*) libtoolize=`which libtoolize 2>/dev/null`
- case $libtoolize in
- /*) ;;
- *) libtoolize=libtoolize
- esac
- esac
- if test -z "$libtoolize"; then
- echo "$0: libtool not found."
- fi
-fi
-# Check for libtool 1.15.14 or newer if used
-if test "$libtool" = "yes"; then
- lt_pversion=`${LIBTOOL:-libtool} --version 2>/dev/null|sed -e
's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
- if test -z "$lt_pversion"; then
- echo "$0: libtool not found."
- echo "You need libtool version 1.5.14 or newer installed"
- exit 1
- fi
- lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
- IFS=.; set $lt_version; IFS=' '
- lt_status="good"
- if test -z "$1"; then a=0 ; else a=$1;fi
- if test -z "$2"; then b=0 ; else b=$2;fi
- if test -z "$3"; then c=0 ; else c=$3;fi
-
- if test "$a" -lt "2"; then
- if test "$b" -lt "5" -o "$b" = "5" -a "$c" -lt "14" ; then
- lt_status="bad"
- fi
- else
- lt_status="bad"
- fi
- if test $lt_status != "good"; then
- echo "$0: libtool version $lt_pversion found."
- echo "You need libtool version 1.5.14 or newer installed"
- exit 1
- fi
-fi
-# Check for libtool 2.2.6 or newer
-if test "$libtool2" = "yes"; then
- lt_pversion=`${LIBTOOL:-libtool} --version 2>/dev/null|sed -e
's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
- if test -z "$lt_pversion"; then
- echo "$0: libtool not found."
- echo "You need libtool version 2.2.6 or newer installed"
- exit 1
- fi
- lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
- IFS=.; set $lt_version; IFS=' '
- lt_status="good"
- if test -z "$1"; then a=0 ; else a=$1;fi
- if test -z "$2"; then b=0 ; else b=$2;fi
- if test -z "$3"; then c=0 ; else c=$3;fi
- if test "$a" -le "2"; then
- if test "$b" -lt "2" -o "$b" = "2" -a "$c" -lt "6" ; then
- lt_status="bad"
- fi
- else
- lt_status="bad"
- fi
- if test $lt_status != "good";
[CVS] RPM: rpm/ rpmpopt.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 09-Sep-2010 10:19:09
Branch: HEAD Handle: 2010090908190800
Modified files:
rpm rpmpopt.in
Log:
Added --arch rpm popt option.
Update --info rpm popt option for displaying Architecture
Should be close lp#633719
Free to revert if not desidered
Summary:
RevisionChanges Path
2.87+5 -1 rpm/rpmpopt.in
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
$ cvs diff -u -r2.86 -r2.87 rpmpopt.in
--- rpm/rpmpopt.in22 Mar 2010 16:44:12 - 2.86
+++ rpm/rpmpopt.in9 Sep 2010 08:19:08 - 2.87
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.86 2010/03/22 16:44:12 jbj Exp $
+# $Id: rpmpopt.in,v 2.87 2010/09/09 08:19:08 devzero2000 Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -113,6 +113,7 @@
%|PACKAGER?{Packager: %{PACKAGER}\n}|\
%|URL?{URL : %{URL}\n}|\
Summary : %{SUMMARY}\n\
+Architecture: %{ARCH}\n\
Description :\n%{DESCRIPTION}\n' \
--POPTdesc=$"list descriptive information from package(s)"
@@ -400,6 +401,9 @@
rpm alias --without --define "_without_!#:+--without-!#:+" \
--POPTdesc=$"disable configure for build" \
--POPTargs=$""
+
+rpm alias --arch --qf '%-34{=NAME}\t%{ARCH}\n' \
+ --POPTdesc=$"list package architecture"
#==
rpmb alias --dbpath --define '_dbpath !#:+' \
--POPTdesc=$"use database in DIRECTORY" \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpmpopt.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 24-Sep-2010 18:11:23 Branch: HEAD Handle: 2010092416112200 Modified files: rpm CHANGES rpmpopt.in Log: added --withoutcheck poptalias Permit rpmbuild --bi --short-circuit skipping %check stanza (#lp:634104) (#mdvbz:35423) Summary: RevisionChanges Path 1.3451 +1 -0 rpm/CHANGES 2.89+3 -1 rpm/rpmpopt.in patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3450 -r1.3451 CHANGES --- rpm/CHANGES 21 Sep 2010 22:08:04 - 1.3450 +++ rpm/CHANGES 24 Sep 2010 16:11:22 - 1.3451 @@ -1,4 +1,5 @@ 5.3.3 -> 5.4a1: +- devzero2000 : added --withoutcheck popt alias (#lp:634104) (#mdvbz:35423) - jbj: i18n: update po files (Translation Project). - jbj: mongo: handle endianness at runtime, remove MONGO_BIG_ENDIAN. - jbj: mongo: replace internal md5 digest with rpmDigestInit(). @@ . patch -p0 <<'@@ .' Index: rpm/rpmpopt.in $ cvs diff -u -r2.88 -r2.89 rpmpopt.in --- rpm/rpmpopt.in13 Sep 2010 22:36:38 - 2.88 +++ rpm/rpmpopt.in24 Sep 2010 16:11:22 - 2.89 @@ -2,7 +2,7 @@ # \verbatim # # @USRLIBRPM@/@configure_input@ -# $Id: rpmpopt.in,v 2.88 2010/09/13 22:36:38 jbj Exp $ +# $Id: rpmpopt.in,v 2.89 2010/09/24 16:11:22 devzero2000 Exp $ # # This file *should not be modified*. Local customizations # belong in /etc/popt, not here. This file will be replaced @@ -444,5 +444,7 @@ --define '_use_internal_dependency_generator 0' \ --notinlsb +rpmbuild alias --withoutcheck--define 'check exit 0' \ + --POPTdesc=$"disable %check stanza for build" # \endverbatim #*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ .gitignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 27-Sep-2010 14:22:15 Branch: HEAD Handle: 2010092712221400 Modified files: rpm .gitignore Log: add a working .gitignore Summary: RevisionChanges Path 1.3 +456 -22rpm/.gitignore patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r1.2 -r1.3 .gitignore --- rpm/.gitignore9 Aug 2010 11:57:17 - 1.2 +++ rpm/.gitignore27 Sep 2010 12:22:14 - 1.3 @@ -1,17 +1,46 @@ -.deps -.depend -.depend-done -.libs -.devtool +_$* +,* +.#* +*~ +*$ +#* +*.a ABOUT-NLS -Doxyfile -Doxytags -Makefile -Makefile.in aclocal.m4 -autom4te* +all_types apidocs +augtool +auth +autom4te* +autom4te.cache +*.bak +*.BAK +bdb.c +bdb.h +benchmark +berkeley_db_svc +bin2c +blib +boldquot.sed +brp-redhat +bsdiff +bspatch +btree_ext.h +cAos2-stub +cat-id-tbl.c +cfghdrs.stamp +cfgoutputs.stamp +ChangeLog +chroot +clib_ext.h +clib_port.h +codeset.m4 +common_ext.h +compat_reports compile +compress_generated_abc +compress_generated_random +compress_generated_text config.cache config.guess config.h @@ -22,37 +51,442 @@ config.status config.sub configure +configure.lineno +convertdb1 +core +count_delete +cp +create_compress_files +.created +cudf-test +cudftool +CVS +CVS.adm +cvslog.* +*.d +db3libobjs +db_archive +db_checkpoint +DB_CONFIG +db_config.h +db_cxx.h +db_deadlock +db_dump +db_ext.h +db.h +db_hotbackup +db_int_def.h +db_int.h +db_load +db_log_verify +db_printlog +db_recover +db_server_clnt.c +db_server.h +db_server_svc.c +db_server_xdr.c +dbsql +db_sql_codegen +db_stat +db_tool +db_upgrade +db_verify +Debug +debugedit +del-* depcomp +.depend +.depend-done +.deps +desc +descriptors_storage +.devtool +devtool-sanity +Doxyfile doxygen -find-requires +Doxytags +dumpasn1 +dumprpm +edos-test +*.elc +...@boldquot.header +endian_swap +...@quot.header +env_ext.h +errors +*.exe +fi.gmo +file +file.1 +file-*.tar.gz +find find-provides +find-requires +*.gcda +*.gcno +gen_db_server.c +gengpg.h +genpgp.h +genssl.h +getdate.c +gettext.m4 +.git +.gitignore +glibc21.m4 +glibc2.m4 +*.gmo +.gnupg +gram.c +gram.h +gram.output +grep +gsr +hash_ext.h +*.header +header_compile_errors +HOME +iconv.m4 +include.tcl +insert-header.sin install-sh +intdiv0.m4 intl +intldir.m4 +intl.m4 +intmax.m4 +inttypes_h.m4 +inttypes-pri.m4 +ixar +java +js +jsautocfg.h +jsautokw.h +*.jsc +jscpucfg +jsd +jskwgen +*.la +*.lcd +lcmessage.m4 +lcov +libcheck.la +libcommon.la +libdelta.la +lib-ld.m4 +lib-link.m4 +liblz.la +liblzma2.la +liblzma.la +liblzma.pc +libmagic.3 +libmagic.la +libpcrecpp.pc +libpcre.pc +libpcreposix.pc +lib-prefix.m4 +librangecoder.la lib-rpmrc +librxar.1.dylib +librxar.so.1 +.libs +libsimple.la +libsubblock.la libtool +libtool.m4 +libxar.1.dylib +libxar.a +libxar.la +libxar.la.in +libxar.so.1 +LINGUAS +Linux_All_DBG.OBJ +listobjs +llocal_lua.c +*.ln +*.lo +lock_ext.h +lock.m4 +log_ext.h +logio +logio_auto.c +logio_auto.h +logio_autop.c +logio_template +logs +longdouble.m4 +longlong.m4 +lookup3 +*.loT ltconfig ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lzmadec +lzmainfo +lzma.pot m4 +*.m4 macros macros-* +macros.rpmbuild +.made_mod +magic +magic.4 +magic.5 +Makefile +Makefile.in +Makefile.inc +Makefile.in.in +Makefile.perl +Makefile.PL +.make.state +Makevars.template +MANIFEST +*.mgc +millionfile-insanity missing mkinstalldirs +mksignal +mkstatval +*.mo +mono +mp_ext.h +mtree +mutex_ext.h +*.ncb +nix-build +nix-channel +nix-collect-garbage +nix-copy-closure +nix-env +nix-hash +nix-install-package +nix-instantiate +nix-log2xml +nix-prefetch-url +nix-pull +nix-push +nix-store +nix-worker +nls.m4 +.nse_depinfo +*.o +*.o +*.obj +*.olb +*.old +*.opt +*.orig +os_ext.h +*.out +pair +pcre-config +pcrecpparg.h +pcrecpp_unittest +pcregrep +pcre.h +pcre_scanner_unittest +pcre_stringpiece.h +pcre_stri
[CVS] RPM: rpm/build/ .gitignore rpm/po/ .gitignore rpm/rpmio/ .gitign...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 27-Sep-2010 19:20:01
Branch: HEAD Handle: 2010092717195901
Modified files:
rpm/tests/ref showrc
Removed files:
rpm/build .gitignore
rpm/po .gitignore
rpm/rpmio .gitignore
rpm/tools .gitignore
Log:
drop useless .gitignore
Summary:
RevisionChanges Path
1.2 +0 -12 rpm/build/.gitignore
1.2 +0 -16 rpm/po/.gitignore
1.2 +0 -57 rpm/rpmio/.gitignore
1.33+0 -17 rpm/tests/ref/showrc
1.2 +0 -50 rpm/tools/.gitignore
rm -f rpm/build/.gitignore <<'@@ .'
Index: rpm/build/.gitignore
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f rpm/po/.gitignore <<'@@ .'
Index: rpm/po/.gitignore
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f rpm/rpmio/.gitignore <<'@@ .'
Index: rpm/rpmio/.gitignore
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/showrc
$ cvs diff -u -r1.32 -r1.33 showrc
--- rpm/tests/ref/showrc 21 Sep 2010 16:08:34 - 1.32
+++ rpm/tests/ref/showrc 27 Sep 2010 17:20:00 - 1.33
@@ -37,22 +37,14 @@
cpuinfo(acpi)
cpuinfo(apic)
cpuinfo(arch_perfmon)
-<<<<<<< showrc
cpuinfo(bogomips) = 5000.07
-===
-cpuinfo(bogomips) = 5985.37
->>>>>>> 1.30
cpuinfo(bts)
cpuinfo(cache_size) = 2048_KB
cpuinfo(clflush)
cpuinfo(clflush_size) = 64
cpuinfo(cmov)
cpuinfo(constant_tsc)
-<<<<<<< showrc
cpuinfo(cpu_MHz) = 1200.000
-===
-cpuinfo(cpu_MHz) = 2992.685
->>>>>>> 1.30
cpuinfo(cpu_family) = 6
cpuinfo(cx16)
cpuinfo(cx8)
@@ -94,10 +86,6 @@
cpuinfo(tm)
cpuinfo(tm2)
cpuinfo(tsc)
-<<<<<<< showrc
-===
-cpuinfo(tsc_reliable)
->>>>>>> 1.30
cpuinfo(vme)
cpuinfo(wp)
cpuinfo(xsave)
@@ -812,8 +800,3 @@
%nil
-14: with%{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-14: without %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-<<<<<<< showrc
- active 488 empty 0
-===
- active 489 empty 0
->>>>>>> 1.30
@@ .
rm -f rpm/tools/.gitignore <<'@@ .'
Index: rpm/tools/.gitignore
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ rpm-size-limit.spec
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 27-Sep-2010 19:21:47
Branch: HEAD Handle: 2010092717214700
Added files:
rpm/tests rpm-size-limit.spec
Log:
add rpm test for rpm size limit: WIP
Summary:
RevisionChanges Path
1.1 +63 -0 rpm/tests/rpm-size-limit.spec
patch -p0 <<'@@ .'
Index: rpm/tests/rpm-size-limit.spec
$ cvs diff -u -r0 -r1.1 rpm-size-limit.spec
--- /dev/null 2010-09-27 19:16:10.0 +0200
+++ rpm-size-limit.spec 2010-09-27 19:21:47.559260438 +0200
@@ -0,0 +1,63 @@
+%{?!nofile:%global nofile 1 }
+%{?!totalfilesizeMB:%global totalfilesizeMB 1 }
+%{?!filesizeMB:%global filesizeMB 1 }
+%{?!compresstgz:%global compresstgz 0 }
+
+%if 0%{?totalfilesizeMB}
+%{expand: %%global filesizeMB $(echo $((%{totalfilesizeMB}/%{nofile})))}
+%endif
+
+Summary:This is a toy rpm to test some rpm size limit
+Name: rpm-size-limit
+Version:1.0
+Release:1
+Group: Development/System
+License:LGPL
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+%description
+
+This toy rpm contains %{nofile} files of
+%{filesizeMB} MB in /tmp/. i
+If you build with --define 'compresstgz 1'
+then the rpm contains twice as much %{nofile} files:
+the compressed tarball version and the non-compressed.
+
+
+Example :
+
+1) as in rhbz#462539
+
+rpmbuild -ba --define 'nofile 1' --define 'totalfilesizeMB 110' --define
'compresstgz 1' %{name}.spec
+
+2) The 2Gb Limit rhbz#498236
+
+rpmbuild -ba --define 'nofile 1' --define 'totalfilesizeMB 2000'
%{name}.spec
+
+
+%prep
+#empty
+%build
+#empty
+%install
+
+mkdir -p %{buildroot}/tmp
+_c=1
+while [ ${_c} -le %{nofile} ]
+do
+ dd if=/dev/zero of=%{buildroot}/tmp/file%{name}${_c} count=%{filesizeMB}
bs=1M
+ [ "%{?compresstgz}" -ne 0 ] && tar -zcvf
%{buildroot}/tmp/file%{name}${_c}.tgz %{buildroot}/tmp/file%{name}${_c}
+ let _c=_c+1
+done
+
+
+%clean
+rm -rf %{buildroot}
+
+%files
+/tmp/file%{name}*
+
+%changelog
+* Mon Sep 27 2010 Elia Pinto - 1.0-1
+- First Build
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ test-change-dir-to-symlink-1.1.spec test-change-...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 30-Sep-2010 15:27:03
Branch: HEAD Handle: 2010093013270200
Added files:
rpm/tests test-change-dir-to-symlink-1.1.spec
test-change-dir-to-symlink-1.2.spec
Log:
added two toy spec for the change directory to symlink issue
Summary:
RevisionChanges Path
1.1 +40 -0 rpm/tests/test-change-dir-to-symlink-1.1.spec
1.1 +100 -0 rpm/tests/test-change-dir-to-symlink-1.2.spec
patch -p0 <<'@@ .'
Index: rpm/tests/test-change-dir-to-symlink-1.1.spec
$ cvs diff -u -r0 -r1.1 test-change-dir-to-symlink-1.1.spec
--- /dev/null 2010-09-30 15:22:01.0 +0200
+++ test-change-dir-to-symlink-1.1.spec 2010-09-30 15:27:02.843124414
+0200
@@ -0,0 +1,40 @@
+Summary: Test Package for testing changing directory to symlink on
upgrade
+Name:test-change-dir-to-symlink
+Version: 1
+Release: 1
+License: LGPL
+Group: Amusements/Games
+URL: http://rpm5.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+BuildArch: noarch
+
+%description
+This is the first package release. It install
+a /tmp/%{name} directory. It will
+be replaced in upgrade by
+a symbolic link to /tmp/%{name}-directory
+
+%prep
+#empty
+%build
+#empty
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT/tmp/%{name}
+echo "hello" > $RPM_BUILD_ROOT/tmp/%{name}/%{name}-file
+echo "I can fix this issue" > %{buildroot}/tmp/%{name}/%{name}-file-1
+mkdir -p %{buildroot}/tmp/%{name}/%{name}-directory-1
+touch %{buildroot}/tmp/%{name}/%{name}-directory-1/%{name}-file-2
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+/tmp/%{name}
+
+%changelog
+* Mon Aug 4 2010 Elia Pinto 1-1
+- First Build
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/test-change-dir-to-symlink-1.2.spec
$ cvs diff -u -r0 -r1.1 test-change-dir-to-symlink-1.2.spec
--- /dev/null 2010-09-30 15:22:01.0 +0200
+++ test-change-dir-to-symlink-1.2.spec 2010-09-30 15:27:02.873126291
+0200
@@ -0,0 +1,100 @@
+Summary: Test Package for testing changing directory to symlink on
upgrade
+Name:test-change-dir-to-symlink
+Version: 1
+Release: 2
+License: LGPL
+Group: AAmusements/Games
+BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
+URL: http://www.rpm5.org
+BuildArch: noarch
+
+%description
+This is the second package release. It replace
+a /tmp/%{name} directory in upgrade with
+a symbolic link to /tmp/%{name}-directory
+
+%prep
+#empty
+
+%build
+#empty
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/tmp/%{name}-directory
+echo "hello" > %{buildroot}/tmp/%{name}-directory/%{name}-file
+echo "I can fix this issue" >
%{buildroot}/tmp/%{name}-directory/%{name}-file-1
+
+ln -s /tmp/%{name}-directory %{buildroot}/tmp/%{name}
+
+#empty
+
+# XXX: fix me -> use %{lua: } drop require and -p
+%pretrans -p /usr/bin/lua
+require('posix')
+local leaf_indent = '| '
+local tail_leaf_indent = ''
+local leaf_prefix = '|-- '
+local tail_leaf_prefix = '`-- '
+local link_prefix = ' -> '
+
+local function printf(...)
+io.write(string.format(unpack(arg)))
+end
+
+local function rm_directory(directory, level, prefix)
+local num_dirs = 0
+local num_files = 0
+if posix.access(directory,"rw") then
+local files = posix.dir(directory)
+local last_file_index = table.getn(files)
+table.sort(files)
+for i, name in ipairs(files) do
+if name ~= '.' and name ~= '..' then
+local full_name = string.format('%s/%s', directory, name)
+local info = assert(posix.stat(full_name))
+local is_tail = (i==last_file_index)
+local prefix2 = is_tail and tail_leaf_prefix or leaf_prefix
+local link = ''
+if info.type == 'link' then
+linked_name = assert(posix.readlink(full_name))
+link = string.forma
[CVS] RPM: rpm/tests/ test-change-dir-to-symlink-1.2.spec
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 30-Sep-2010 16:56:02
Branch: HEAD Handle: 2010093014560200
Modified files:
rpm/tests test-change-dir-to-symlink-1.2.spec
Log:
fix lua script invocation
Summary:
RevisionChanges Path
1.2 +2 -3 rpm/tests/test-change-dir-to-symlink-1.2.spec
patch -p0 <<'@@ .'
Index: rpm/tests/test-change-dir-to-symlink-1.2.spec
$ cvs diff -u -r1.1 -r1.2 test-change-dir-to-symlink-1.2.spec
--- rpm/tests/test-change-dir-to-symlink-1.2.spec 30 Sep 2010 13:27:02
- 1.1
+++ rpm/tests/test-change-dir-to-symlink-1.2.spec 30 Sep 2010 14:56:02
- 1.2
@@ -29,9 +29,7 @@
#empty
-# XXX: fix me -> use %{lua: } drop require and -p
-%pretrans -p /usr/bin/lua
-require('posix')
+%pretrans -p
local leaf_indent = '| '
local tail_leaf_indent = ''
local leaf_prefix = '|-- '
@@ -87,6 +85,7 @@
end
call_rm_directory("/tmp/%{name}")
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ test-change-dir-to-symlink-1.2.spec
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 01-Oct-2010 16:40:19
Branch: HEAD Handle: 2010100114401900
Modified files:
rpm/tests test-change-dir-to-symlink-1.2.spec
Log:
estetic change to test-change-dir-to-symlink-1.2.spec
Summary:
RevisionChanges Path
1.3 +26 -15 rpm/tests/test-change-dir-to-symlink-1.2.spec
patch -p0 <<'@@ .'
Index: rpm/tests/test-change-dir-to-symlink-1.2.spec
$ cvs diff -u -r1.2 -r1.3 test-change-dir-to-symlink-1.2.spec
--- rpm/tests/test-change-dir-to-symlink-1.2.spec 30 Sep 2010 14:56:02
- 1.2
+++ rpm/tests/test-change-dir-to-symlink-1.2.spec 1 Oct 2010 14:40:19
- 1.3
@@ -3,15 +3,15 @@
Version: 1
Release: 2
License: LGPL
-Group: AAmusements/Games
+Group: Amusements/Games
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
URL: http://www.rpm5.org
BuildArch: noarch
%description
-This is the second package release. It replace
-a /tmp/%{name} directory in upgrade with
-a symbolic link to /tmp/%{name}-directory
+This is the second package release of %{name}
+In this release the /tmp/%{name} directory became
+a symbolic link to /tmp/%{name}-directory.
%prep
#empty
@@ -30,6 +30,12 @@
#empty
%pretrans -p
+-- Lua block of code for removing a directory recursively
+-- The Lua function remove_directory_deep should be called
+-- with a directory name or, in a spec file, also with
+-- a rpm macro defined to a directory name. This function
+-- is a possible lua equivalent of the shell command "rm -rf"
+-- using the lua posix extension embedded in rpm
local leaf_indent = '| '
local tail_leaf_indent = ''
local leaf_prefix = '|-- '
@@ -40,7 +46,7 @@
io.write(string.format(unpack(arg)))
end
-local function rm_directory(directory, level, prefix)
+local function remove_directory(directory, level, prefix)
local num_dirs = 0
local num_files = 0
if posix.access(directory,"rw") then
@@ -59,16 +65,18 @@
link = string.format('%s%s', link_prefix, linked_name)
posix.unlink(full_name)
end
-printf('%s%s%s%s\n', prefix, prefix2, name, link)
+
+ -- printf('%s%s%s%s\n', prefix, prefix2, name, link)
+
if info.type == 'directory' then
local indent = is_tail and tail_leaf_indent or leaf_indent
-sub_dirs, sub_files = rm_directory(full_name, level+1,
+sub_dirs, sub_files = remove_directory(full_name, level+1,
prefix .. indent)
num_dirs = num_dirs + sub_dirs + 1
num_files = num_files + sub_files
posix.rmdir(full_name)
else
-print(posix.unlink(full_name))
+posix.unlink(full_name)
num_files = num_files + 1
end
end
@@ -77,13 +85,17 @@
return num_dirs, num_files
end
-local function call_rm_directory(directory)
-print(directory)
-num_dirs, num_files = rm_directory(directory, 0, '')
-printf('\ndropped %d directories, %d files\n', num_dirs, num_files)
+local function remove_directory_deep(directory)
+
+-- print(directory)
+
+num_dirs, num_files = remove_directory(directory, 0, '')
+
+-- printf('\ndropped %d directories, %d files\n', num_dirs, num_files)
+
posix.rmdir(directory)
end
-call_rm_directory("/tmp/%{name}")
+remove_directory_deep("/tmp/%{name}")
%clean
@@ -95,5 +107,4 @@
%changelog
* Mon Aug 4 2010 Elia Pinto 1-2
-- change /tmp/%{name} dir to a symbolic link
- to /tmp/%{name}-directory
+- First Build
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 11-Oct-2010 17:18:38 Branch: HEAD Handle: 2010101115183800 Modified files: poptconfigure.ac Log: Remove AC_CANONICAL_TARGET macro from configure Removes the use of AC_CANONICAL_TARGET macro from the configure.ac file, and replaces it with the proper AC_CANONICAL_HOST. The use of AC_CANONICAL_TARGET is usually limited to compilers and other tools that have to deal with executable code, and is not intended as the system where the code is going to run. For more info see http://blog.flameeyes.eu/s/canonical-target . Summary: RevisionChanges Path 1.75+1 -1 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.74 -r1.75 configure.ac --- popt/configure.ac 12 Aug 2010 16:56:37 - 1.74 +++ popt/configure.ac 11 Oct 2010 15:18:38 - 1.75 @@ -10,7 +10,7 @@ # Must come before AM_INIT_AUTOMAKE. AC_CONFIG_AUX_DIR([build-aux]) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST AM_INIT_AUTOMAKE([-Wall -Werror foreign]) # # Checks for programs. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ .gitignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 13-Oct-2010 17:20:18 Branch: HEAD Handle: 2010101315201800 Modified files: rpm .gitignore Log: update .gitignore Summary: RevisionChanges Path 1.4 +416 -0 rpm/.gitignore patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r1.3 -r1.4 .gitignore --- rpm/.gitignore27 Sep 2010 12:22:14 - 1.3 +++ rpm/.gitignore13 Oct 2010 15:20:18 - 1.4 @@ -1,3 +1,419 @@ +ABOUT-NLS +aclocal.m4 +all_types +apidocs +augtool +auth +autom4te* +autom4te.cache +bdb.c +bdb.h +benchmark +bin2c +blib +boldquot.sed +brp-redhat +bsdiff +bspatch +cAos2-stub +cat-id-tbl.c +cfghdrs.stamp +cfgoutputs.stamp +ChangeLog +chroot +codeset.m4 +compat_reports +compile +compress_generated_abc +compress_generated_random +compress_generated_text +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.site +config.status +config.sub +configure +convertdb1 +count_delete +cp +create_compress_files +.created +cudf-test +cudftool +*.d +DB_CONFIG +dbsql +db_sql_codegen +db_tool +Debug +debugedit +depcomp +.depend +.depend-done +.deps +desc +descriptors_storage +.devtool +devtool-sanity +Doxyfile +doxygen +Doxytags +dumpasn1 +dumprpm +edos-test +...@boldquot.header +endian_swap +...@quot.header +errors +fi.gmo +file +file.1 +file-*.tar.gz +find +find-provides +find-requires +*.gcda +*.gcno +gengpg.h +genpgp.h +genssl.h +getdate.c +gettext.m4 +.git +.gitignore +glibc21.m4 +glibc2.m4 +*.gmo +.gnupg +gram.c +gram.h +gram.output +grep +gsr +*.header +header_compile_errors +HOME +iconv.m4 +insert-header.sin +install-sh +intdiv0.m4 +intl +intldir.m4 +intl.m4 +intmax.m4 +inttypes_h.m4 +inttypes-pri.m4 +ixar +java +js +jsautocfg.h +jsautokw.h +.*.jsc +*.jsc +jscpucfg +jsd +jskwgen +*.la +*.lcd +lcmessage.m4 +lcov +libcheck.la +libcommon.la +libdelta.la +lib-ld.m4 +lib-link.m4 +liblz.la +liblzma2.la +liblzma.la +liblzma.pc +libmagic.3 +libmagic.la +libpcrecpp.pc +libpcre.pc +libpcreposix.pc +lib-prefix.m4 +librangecoder.la +lib-rpmrc +librxar.1.dylib +librxar.so.1 +.libs +libsimple.la +libsubblock.la +libtool +libtool.m4 +libxar.1.dylib +libxar.a +libxar.la +libxar.la.in +libxar.so.1 +LINGUAS +Linux_All_DBG.OBJ +listobjs +llocal_lua.c +*.lo +lock.m4 +logio +logio_auto.c +logio_auto.h +logio_autop.c +logio_template +logs +longdouble.m4 +longlong.m4 +lookup3 +*.loT +ltconfig +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lzmadec +lzmainfo +lzma.pot +m4 +*.m4 +macros +macros-* +macros.rpmbuild +.made_mod +magic +magic.4 +magic.5 +Makefile +Makefile.in +Makefile.inc +Makefile.in.in +Makefile.perl +Makefile.PL +Makevars.template +MANIFEST +*.mgc +millionfile-insanity +missing +mkinstalldirs +mksignal +mkstatval +*.mo +mono +mtree +*.ncb +nix-build +nix-channel +nix-collect-garbage +nix-copy-closure +nix-env +nix-hash +nix-install-package +nix-instantiate +nix-log2xml +nix-prefetch-url +nix-pull +nix-push +nix-store +nix-worker +nls.m4 +*.o +*.opt +*.out +pair +pcre-config +pcrecpparg.h +pcrecpp_unittest +pcregrep +pcre.h +pcre_scanner_unittest +pcre_stringpiece.h +pcre_stringpiece_unittest +pcretest +*.pdb +perl +php +pkgconfig +platform +*.plg +pm_to_blib +po.m4 +popt +popt*.rpm +POTFILES +printf-posix.m4 +probes-test +progtest.m4 +*.pyc +python +quot.sed +rc +README +Release +remove-potcdate.sed +remove-potcdate.sin +repodata +resize +rpm +*.rpm +RPM-* +rpm2cpio +rpm[a-z] +rpmborg +RPM.bs +rpmbuild +RPM.c +rpmcache +rpmcmp +rpmconstant +RPM_Constant.c +rpmconstanttbl.c +rpmconvert +rpmcpio +rpmcurl +rpmdb +RPM_Dependencies.c +rpmdeps +rpmdigest +rpmdpkg +RPM_Files.c +rpmgenpkglist +rpmgensrclist +rpmgpg +rpmgrep +RPM_Header.c +rpmkey +rpmlua +rpmluac +RPM_PackageIterator.c +rpmpbzip2 +rpm.pc +rpmpigz +rpmpopt* +RPM_Problems.c +rpmrc +rpmrepo +rpm.spec +RPM_Spec.c +rpmspecdump +rpmtar +rpm-*.tar.gz +R
[CVS] RPM: rpm-5_3: rpm/ .gitignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 13-Oct-2010 18:02:02 Branch: rpm-5_3 Handle: 2010101316020100 Modified files: (Branch: rpm-5_3) rpm .gitignore Log: update .gitignore Summary: RevisionChanges Path 1.1.2.1 +866 -11rpm/.gitignore patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r1.1 -r1.1.2.1 .gitignore --- rpm/.gitignore27 Nov 2009 16:07:04 - 1.1 +++ rpm/.gitignore13 Oct 2010 16:02:01 - 1.1.2.1 @@ -1,17 +1,462 @@ -.deps +ABOUT-NLS +aclocal.m4 +all_types +apidocs +augtool +auth +autom4te* +autom4te.cache +bdb.c +bdb.h +benchmark +bin2c +blib +boldquot.sed +brp-redhat +bsdiff +bspatch +cAos2-stub +cat-id-tbl.c +cfghdrs.stamp +cfgoutputs.stamp +ChangeLog +chroot +codeset.m4 +compat_reports +compile +compress_generated_abc +compress_generated_random +compress_generated_text +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.site +config.status +config.sub +configure +convertdb1 +count_delete +cp +create_compress_files +.created +cudf-test +cudftool +*.d +DB_CONFIG +dbsql +db_sql_codegen +db_tool +Debug +debugedit +depcomp .depend .depend-done -.libs +.deps +desc +descriptors_storage .devtool -ABOUT-NLS +devtool-sanity Doxyfile +doxygen Doxytags +dumpasn1 +dumprpm +edos-test +...@boldquot.header +endian_swap +...@quot.header +errors +fi.gmo +file +file.1 +file-*.tar.gz +find +find-provides +find-requires +*.gcda +*.gcno +gengpg.h +genpgp.h +genssl.h +getdate.c +gettext.m4 +.git +.gitignore +glibc21.m4 +glibc2.m4 +*.gmo +.gnupg +gram.c +gram.h +gram.output +grep +gsr +*.header +header_compile_errors +HOME +iconv.m4 +insert-header.sin +install-sh +intdiv0.m4 +intl +intldir.m4 +intl.m4 +intmax.m4 +inttypes_h.m4 +inttypes-pri.m4 +ixar +java +js +jsautocfg.h +jsautokw.h +.*.jsc +*.jsc +jscpucfg +jsd +jskwgen +*.la +*.lcd +lcmessage.m4 +lcov +libcheck.la +libcommon.la +libdelta.la +lib-ld.m4 +lib-link.m4 +liblz.la +liblzma2.la +liblzma.la +liblzma.pc +libmagic.3 +libmagic.la +libpcrecpp.pc +libpcre.pc +libpcreposix.pc +lib-prefix.m4 +librangecoder.la +lib-rpmrc +librxar.1.dylib +librxar.so.1 +.libs +libsimple.la +libsubblock.la +libtool +libtool.m4 +libxar.1.dylib +libxar.a +libxar.la +libxar.la.in +libxar.so.1 +LINGUAS +Linux_All_DBG.OBJ +listobjs +llocal_lua.c +*.lo +lock.m4 +logio +logio_auto.c +logio_auto.h +logio_autop.c +logio_template +logs +longdouble.m4 +longlong.m4 +lookup3 +*.loT +ltconfig +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lzmadec +lzmainfo +lzma.pot +m4 +*.m4 +macros +macros-* +macros.rpmbuild +.made_mod +magic +magic.4 +magic.5 Makefile Makefile.in +Makefile.inc +Makefile.in.in +Makefile.perl +Makefile.PL +Makevars.template +MANIFEST +*.mgc +millionfile-insanity +missing +mkinstalldirs +mksignal +mkstatval +*.mo +mono +mtree +*.ncb +nix-build +nix-channel +nix-collect-garbage +nix-copy-closure +nix-env +nix-hash +nix-install-package +nix-instantiate +nix-log2xml +nix-prefetch-url +nix-pull +nix-push +nix-store +nix-worker +nls.m4 +*.o +*.opt +*.out +pair +pcre-config +pcrecpparg.h +pcrecpp_unittest +pcregrep +pcre.h +pcre_scanner_unittest +pcre_stringpiece.h +pcre_stringpiece_unittest +pcretest +*.pdb +perl +php +pkgconfig +platform +*.plg +pm_to_blib +po.m4 +popt +popt*.rpm +POTFILES +printf-posix.m4 +probes-test +progtest.m4 +*.pyc +python +quot.sed +rc +README +Release +remove-potcdate.sed +remove-potcdate.sin +repodata +resize +rpm +*.rpm +RPM-* +rpm2cpio +rpm[a-z] +rpmborg +RPM.bs +rpmbuild +RPM.c +rpmcache +rpmcmp +rpmconstant +RPM_Constant.c +rpmconstanttbl.c +rpmconvert +rpmcpio +rpmcurl +rpmdb +RPM_Dependencies.c +rpmdeps +rpmdigest +rpmdpkg +RPM_Files.c +rpmgenpkglist +rpmgensrclist +rpmgpg +rpmgrep +RPM_Header.c +rpmkey +rpmlua +rpmluac +RPM_PackageIterator.c +rpmpbzip2 +rpm.pc +rpmpigz +rpmpopt* +RPM_Problems.c +rpmrc +rpm
[CVS] RPM: rpm-5_2: rpm/ .gitignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 13-Oct-2010 18:06:03 Branch: rpm-5_2 Handle: 2010101316060300 Added files: (Branch: rpm-5_2) rpm .gitignore Log: update .gitignore Summary: RevisionChanges Path 1.4.2.2 +908 -0 rpm/.gitignore patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r0 -r1.4.2.2 .gitignore --- /dev/null 2010-10-13 18:05:19.0 +0200 +++ .gitignore2010-10-13 18:06:03.794720634 +0200 @@ -0,0 +1,908 @@ +ABOUT-NLS +aclocal.m4 +all_types +apidocs +augtool +auth +autom4te* +autom4te.cache +bdb.c +bdb.h +benchmark +bin2c +blib +boldquot.sed +brp-redhat +bsdiff +bspatch +cAos2-stub +cat-id-tbl.c +cfghdrs.stamp +cfgoutputs.stamp +ChangeLog +chroot +codeset.m4 +compat_reports +compile +compress_generated_abc +compress_generated_random +compress_generated_text +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.site +config.status +config.sub +configure +convertdb1 +count_delete +cp +create_compress_files +.created +cudf-test +cudftool +*.d +DB_CONFIG +dbsql +db_sql_codegen +db_tool +Debug +debugedit +depcomp +.depend +.depend-done +.deps +desc +descriptors_storage +.devtool +devtool-sanity +Doxyfile +doxygen +Doxytags +dumpasn1 +dumprpm +edos-test +...@boldquot.header +endian_swap +...@quot.header +errors +fi.gmo +file +file.1 +file-*.tar.gz +find +find-provides +find-requires +*.gcda +*.gcno +gengpg.h +genpgp.h +genssl.h +getdate.c +gettext.m4 +.git +.gitignore +glibc21.m4 +glibc2.m4 +*.gmo +.gnupg +gram.c +gram.h +gram.output +grep +gsr +*.header +header_compile_errors +HOME +iconv.m4 +insert-header.sin +install-sh +intdiv0.m4 +intl +intldir.m4 +intl.m4 +intmax.m4 +inttypes_h.m4 +inttypes-pri.m4 +ixar +java +js +jsautocfg.h +jsautokw.h +.*.jsc +*.jsc +jscpucfg +jsd +jskwgen +*.la +*.lcd +lcmessage.m4 +lcov +libcheck.la +libcommon.la +libdelta.la +lib-ld.m4 +lib-link.m4 +liblz.la +liblzma2.la +liblzma.la +liblzma.pc +libmagic.3 +libmagic.la +libpcrecpp.pc +libpcre.pc +libpcreposix.pc +lib-prefix.m4 +librangecoder.la +lib-rpmrc +librxar.1.dylib +librxar.so.1 +.libs +libsimple.la +libsubblock.la +libtool +libtool.m4 +libxar.1.dylib +libxar.a +libxar.la +libxar.la.in +libxar.so.1 +LINGUAS +Linux_All_DBG.OBJ +listobjs +llocal_lua.c +*.lo +lock.m4 +logio +logio_auto.c +logio_auto.h +logio_autop.c +logio_template +logs +longdouble.m4 +longlong.m4 +lookup3 +*.loT +ltconfig +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lzmadec +lzmainfo +lzma.pot +m4 +*.m4 +macros +macros-* +macros.rpmbuild +.made_mod +magic +magic.4 +magic.5 +Makefile +Makefile.in +Makefile.inc +Makefile.in.in +Makefile.perl +Makefile.PL +Makevars.template +MANIFEST +*.mgc +millionfile-insanity +missing +mkinstalldirs +mksignal +mkstatval +*.mo +mono +mtree +*.ncb +nix-build +nix-channel +nix-collect-garbage +nix-copy-closure +nix-env +nix-hash +nix-install-package +nix-instantiate +nix-log2xml +nix-prefetch-url +nix-pull +nix-push +nix-store +nix-worker +nls.m4 +*.o +*.opt +*.out +pair +pcre-config +pcrecpparg.h +pcrecpp_unittest +pcregrep +pcre.h +pcre_scanner_unittest +pcre_stringpiece.h +pcre_stringpiece_unittest +pcretest +*.pdb +perl +php +pkgconfig +platform +*.plg +pm_to_blib +po.m4 +popt +popt*.rpm +POTFILES +printf-posix.m4 +probes-test +progtest.m4 +*.pyc +python +quot.sed +rc +README +Release +remove-potcdate.sed +remove-potcdate.sin +repodata +resize +rpm +*.rpm +RPM-* +rpm2cpio +rpm[a-z] +rpmborg +RPM.bs +rpmbuild +RPM.c +rpmcache +rpmcmp +rpmconstant +RPM_Constant.c +rpmconstanttbl.c +rpmconvert +rpmcpio +rpmcurl +rpmdb +RPM_Dependencies.c +rpmdeps +rpmdigest +rpmdpkg +RPM_Files.c +rpmgenpkglist +rpmgensrclist +rpmgpg +rpmgrep +RPM_Header.c +rpmkey +rpmlua +rpmluac +RPM_PackageIterator.c +rpmpbzip2 +rpm.pc +rpmpigz +rpmpopt* +RPM_Problems.c +rpmrc +rpmrepo +rpm.spec +RPM_Spec.c +rpmspecdump +rpmtar
[CVS] RPM: rpm-5_1: rpm/ .gitignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 13-Oct-2010 18:07:27 Branch: rpm-5_1 Handle: 2010101316072700 Added files: (Branch: rpm-5_1) rpm .gitignore Log: update .gitignore Summary: RevisionChanges Path 1.4.4.2 +908 -0 rpm/.gitignore patch -p0 <<'@@ .' Index: rpm/.gitignore $ cvs diff -u -r0 -r1.4.4.2 .gitignore --- /dev/null 2010-10-13 18:06:07.0 +0200 +++ .gitignore2010-10-13 18:07:27.749154016 +0200 @@ -0,0 +1,908 @@ +ABOUT-NLS +aclocal.m4 +all_types +apidocs +augtool +auth +autom4te* +autom4te.cache +bdb.c +bdb.h +benchmark +bin2c +blib +boldquot.sed +brp-redhat +bsdiff +bspatch +cAos2-stub +cat-id-tbl.c +cfghdrs.stamp +cfgoutputs.stamp +ChangeLog +chroot +codeset.m4 +compat_reports +compile +compress_generated_abc +compress_generated_random +compress_generated_text +config.cache +config.guess +config.h +config.h.in +config.log +config.rpath +config.site +config.status +config.sub +configure +convertdb1 +count_delete +cp +create_compress_files +.created +cudf-test +cudftool +*.d +DB_CONFIG +dbsql +db_sql_codegen +db_tool +Debug +debugedit +depcomp +.depend +.depend-done +.deps +desc +descriptors_storage +.devtool +devtool-sanity +Doxyfile +doxygen +Doxytags +dumpasn1 +dumprpm +edos-test +...@boldquot.header +endian_swap +...@quot.header +errors +fi.gmo +file +file.1 +file-*.tar.gz +find +find-provides +find-requires +*.gcda +*.gcno +gengpg.h +genpgp.h +genssl.h +getdate.c +gettext.m4 +.git +.gitignore +glibc21.m4 +glibc2.m4 +*.gmo +.gnupg +gram.c +gram.h +gram.output +grep +gsr +*.header +header_compile_errors +HOME +iconv.m4 +insert-header.sin +install-sh +intdiv0.m4 +intl +intldir.m4 +intl.m4 +intmax.m4 +inttypes_h.m4 +inttypes-pri.m4 +ixar +java +js +jsautocfg.h +jsautokw.h +.*.jsc +*.jsc +jscpucfg +jsd +jskwgen +*.la +*.lcd +lcmessage.m4 +lcov +libcheck.la +libcommon.la +libdelta.la +lib-ld.m4 +lib-link.m4 +liblz.la +liblzma2.la +liblzma.la +liblzma.pc +libmagic.3 +libmagic.la +libpcrecpp.pc +libpcre.pc +libpcreposix.pc +lib-prefix.m4 +librangecoder.la +lib-rpmrc +librxar.1.dylib +librxar.so.1 +.libs +libsimple.la +libsubblock.la +libtool +libtool.m4 +libxar.1.dylib +libxar.a +libxar.la +libxar.la.in +libxar.so.1 +LINGUAS +Linux_All_DBG.OBJ +listobjs +llocal_lua.c +*.lo +lock.m4 +logio +logio_auto.c +logio_auto.h +logio_autop.c +logio_template +logs +longdouble.m4 +longlong.m4 +lookup3 +*.loT +ltconfig +ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lzmadec +lzmainfo +lzma.pot +m4 +*.m4 +macros +macros-* +macros.rpmbuild +.made_mod +magic +magic.4 +magic.5 +Makefile +Makefile.in +Makefile.inc +Makefile.in.in +Makefile.perl +Makefile.PL +Makevars.template +MANIFEST +*.mgc +millionfile-insanity +missing +mkinstalldirs +mksignal +mkstatval +*.mo +mono +mtree +*.ncb +nix-build +nix-channel +nix-collect-garbage +nix-copy-closure +nix-env +nix-hash +nix-install-package +nix-instantiate +nix-log2xml +nix-prefetch-url +nix-pull +nix-push +nix-store +nix-worker +nls.m4 +*.o +*.opt +*.out +pair +pcre-config +pcrecpparg.h +pcrecpp_unittest +pcregrep +pcre.h +pcre_scanner_unittest +pcre_stringpiece.h +pcre_stringpiece_unittest +pcretest +*.pdb +perl +php +pkgconfig +platform +*.plg +pm_to_blib +po.m4 +popt +popt*.rpm +POTFILES +printf-posix.m4 +probes-test +progtest.m4 +*.pyc +python +quot.sed +rc +README +Release +remove-potcdate.sed +remove-potcdate.sin +repodata +resize +rpm +*.rpm +RPM-* +rpm2cpio +rpm[a-z] +rpmborg +RPM.bs +rpmbuild +RPM.c +rpmcache +rpmcmp +rpmconstant +RPM_Constant.c +rpmconstanttbl.c +rpmconvert +rpmcpio +rpmcurl +rpmdb +RPM_Dependencies.c +rpmdeps +rpmdigest +rpmdpkg +RPM_Files.c +rpmgenpkglist +rpmgensrclist +rpmgpg +rpmgrep +RPM_Header.c +rpmkey +rpmlua +rpmluac +RPM_PackageIterator.c +rpmpbzip2 +rpm.pc +rpmpigz +rpmpopt* +RPM_Problems.c +rpmrc +rpmrepo +rpm.spec +RPM_Spec.c +rpmspecdump +rpmtar
[CVS] RPM: rpm/ CHANGES rpmpopt.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 14-Oct-2010 11:43:37
Branch: HEAD Handle: 2010101409433700
Modified files:
rpm CHANGES rpmpopt.in
Log:
add an --setfscontext popt alias (lp#660406)
Summary:
RevisionChanges Path
1.3468 +1 -0 rpm/CHANGES
2.92+6 -1 rpm/rpmpopt.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3467 -r1.3468 CHANGES
--- rpm/CHANGES 13 Oct 2010 18:13:46 - 1.3467
+++ rpm/CHANGES 14 Oct 2010 09:43:37 - 1.3468
@@ -1,4 +1,5 @@
5.3.4 -> 5.4a1:
+- devzero2000: add an --setfscontext popt alias (lp#660406)
- jbj: spewage: use RPMTAG_SHA1HEADER as the primary retrieval key.
- jbj: rpmpopt: fix: permit popt aliases to be used w "make check".
- jbj: pgp: add a 2nd parameter to pgpDigNew to generate a keypair.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
$ cvs diff -u -r2.91 -r2.92 rpmpopt.in
--- rpm/rpmpopt.in11 Oct 2010 00:01:31 - 2.91
+++ rpm/rpmpopt.in14 Oct 2010 09:43:37 - 2.92
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.91 2010/10/11 00:01:31 jbj Exp $
+# $Id: rpmpopt.in,v 2.92 2010/10/14 09:43:37 devzero2000 Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -82,6 +82,11 @@
--pipe "(echo 'ch() { chown -h -- \"$1\" \"$3\";chgrp -h -- \"$2\"
\"$3\"; }';grep -v \(none\))|sh" \
--POPTdesc=$"set user/group ownership of files in a package"
+rpm alias --setfscontext -q --qf \
+ '[%{FILENAMES}\n]' \
+--pipe "[ -x /sbin/restorecon ] && /sbin/restorecon -R -i -f - ||
:" \
+--POPTdesc=$"set selinux extended attributes file context of files
in a package"
+
rpm alias --conflicts --qf \
"[%{CONFLICTNAME}%{CONFLICTFLAGS:depflags}%{CONFLICTVERSION}\n]" \
--POPTdesc=$"list capabilities this package conflicts with"
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 26-Oct-2010 18:09:39 Branch: HEAD Handle: 2010102616093900 Modified files: poptCHANGES configure.ac Log: require, as in autogen.sh, a minimal automake version for bootstrap Summary: RevisionChanges Path 1.145 +1 -0 popt/CHANGES 1.76+1 -1 popt/configure.ac patch -p0 <<'@@ .' Index: popt/CHANGES $ cvs diff -u -r1.144 -r1.145 CHANGES --- popt/CHANGES 26 Jul 2010 16:46:32 - 1.144 +++ popt/CHANGES 26 Oct 2010 16:09:39 - 1.145 @@ -1,4 +1,5 @@ 1.17 -> 2.0: +- devzero2000: require, as in autogen.sh, a minimal automake version for bootstrap - devzero2000: added --enable-valgrind autoconf option - Fixed VPATH building with arbitrary directory structure - devzero2000: some minor fix to autofu and also a minor portability problem on AIX @@ . patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.75 -r1.76 configure.ac --- popt/configure.ac 11 Oct 2010 15:18:38 - 1.75 +++ popt/configure.ac 26 Oct 2010 16:09:39 - 1.76 @@ -11,7 +11,7 @@ # Must come before AM_INIT_AUTOMAKE. AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign]) # # Checks for programs. # Set common system defines for POSIX extensions, such as GNU_SOURCE @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 26-Oct-2010 18:22:06 Branch: HEAD Handle: 2010102616220600 Modified files: poptCHANGES Makefile.am Log: fix: add missing automake per target test* LDFLAGS Summary: RevisionChanges Path 1.146 +1 -0 popt/CHANGES 1.72+3 -0 popt/Makefile.am patch -p0 <<'@@ .' Index: popt/CHANGES $ cvs diff -u -r1.145 -r1.146 CHANGES --- popt/CHANGES 26 Oct 2010 16:09:39 - 1.145 +++ popt/CHANGES 26 Oct 2010 16:22:06 - 1.146 @@ -1,4 +1,5 @@ 1.17 -> 2.0: +- devzero2000: fix: add missing automake per target test* LDFLAGS - devzero2000: require, as in autogen.sh, a minimal automake version for bootstrap - devzero2000: added --enable-valgrind autoconf option - Fixed VPATH building with arbitrary directory structure @@ . patch -p0 <<'@@ .' Index: popt/Makefile.am $ cvs diff -u -r1.71 -r1.72 Makefile.am --- popt/Makefile.am 26 Oct 2010 15:59:47 - 1.71 +++ popt/Makefile.am 26 Oct 2010 16:22:06 - 1.72 @@ -27,6 +27,9 @@ test1_CFLAGS = $(AM_CFLAGS) test2_CFLAGS = $(AM_CFLAGS) tdict_CFLAGS = $(AM_CFLAGS) +test1_LDFLAGS = $(AM_LDFLAGS) +test2_LDFLAGS = $(AM_LDFLAGS) +tdict_LDFLAGS = $(AM_LDFLAGS) test1_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) test2_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) tdict_LDADD = $(top_builddir)/$(usrlib_LTLIBRARIES) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES test-poptrc test2.c testit.sh
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: popt Date: 27-Oct-2010 14:48:36
Branch: HEAD Handle: 2010102712483500
Modified files:
poptCHANGES test-poptrc test2.c testit.sh
Log:
add test2 to the unit test: augment make check with some test2 tests
Summary:
RevisionChanges Path
1.147 +1 -0 popt/CHANGES
1.9 +6 -0 popt/test-poptrc
1.7 +17 -3 popt/test2.c
1.37+308 -0 popt/testit.sh
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.146 -r1.147 CHANGES
--- popt/CHANGES 26 Oct 2010 16:22:06 - 1.146
+++ popt/CHANGES 27 Oct 2010 12:48:35 - 1.147
@@ -1,4 +1,5 @@
1.17 -> 2.0:
+- devzero2000: add test2 to the unit test: augment make check with some
test2 tests
- devzero2000: fix: add missing automake per target test* LDFLAGS
- devzero2000: require, as in autogen.sh, a minimal automake version for
bootstrap
- devzero2000: added --enable-valgrind autoconf option
@@ .
patch -p0 <<'@@ .'
Index: popt/test-poptrc
$ cvs diff -u -r1.8 -r1.9 test-poptrc
--- popt/test-poptrc 18 May 2010 16:45:53 - 1.8
+++ popt/test-poptrc 27 Oct 2010 12:48:35 - 1.9
@@ -11,3 +11,9 @@
test1 exec --echo-args /bin/echo
test1 alias -e --echo-args
test1 exec -a /bin/echo
+test2 alias --pwd --password \
+ --POPTdesc=$"password" --POPTargs=$"ARG"
+test2 alias --twotest2 --keyfile=popt-key-file -F popt-fax
+test2 alias -V --dayphone
+test2 alias -Z --fax
+test2 exec -Y /bin/echo
@@ .
patch -p0 <<'@@ .'
Index: popt/test2.c
$ cvs diff -u -r1.6 -r1.7 test2.c
--- popt/test2.c 14 Jun 2007 08:11:52 - 1.6
+++ popt/test2.c 27 Oct 2010 12:48:35 - 1.7
@@ -26,7 +26,7 @@
char *dbPassword = NULL;
char *dbUserName = NULL;
-char *rcfile = "createuser-defaults";
+char *rcfile = "test-poptrc";
char *username=NULL;
char *password = NULL;
@@ -127,8 +127,22 @@
mtrace(); /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
#endif
-optCon = poptGetContext("createuser", argc, argv, optionsTable, 0);
-poptReadConfigFile(optCon, rcfile );
+optCon = poptGetContext("test2", argc, argv, optionsTable, 0);
+#ifdef HAVE_STDLIB_H
+rcfile = getenv ("testpoptrc");
+if (rcfile != NULL ) {
+(void) poptReadConfigFile(optCon, rcfile );
+}
+else {
+(void) poptReadConfigFile(optCon, "./test-poptrc");
+/* : make distcheck succed : test2 is in popt-/_build */
+(void) poptReadConfigFile(optCon, "../../test-poptrc");
+}
+#else
+(void) poptReadConfigFile(optCon, "./test-poptrc");
+/* : make distcheck succed : test2 is in popt-/_build */
+(void) poptReadConfigFile(optCon, "../../test-poptrc");
+#endif
/* although there are no options to be parsed, check for --help */
poptGetNextOpt(optCon);
@@ .
patch -p0 <<'@@ .'
Index: popt/testit.sh
$ cvs diff -u -r1.36 -r1.37 testit.sh
--- popt/testit.sh26 Jul 2010 16:51:21 - 1.36
+++ popt/testit.sh27 Oct 2010 12:48:35 - 1.37
@@ -188,6 +188,314 @@
-?, --help Show this help message
--usage Display brief usage message" --help
+run test2 "test2 - 1" "\
+dbusername popt-DBUserName dbpassword (null)
+txhost (null)txsslport 443 txstoreid 0 pathofkeyfile
popt-key-file
+username popt-user password popt-password firstname popt-first
lastname (null)
+addr1 popt-addr1 addr2 popt-addr2city popt-city state
popt-statepostal popt-postal
+country popt-country email popt-emaildayphone popt-dayphone fax
popt-fax" --keyfile=popt-key-file --cnpath=popt-content-path
--dbusername=popt-DBUserName --first=popt-first -1=popt-addr1 -2=popt-addr2
-c=popt-city -s=popt-state -F=popt-fax -u=popt-user -p=popt-password
-1=popt-addr1 -2=popt-
[CVS] RPM: popt/ .gitignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: popt Date: 27-Oct-2010 15:25:30 Branch: HEAD Handle: 2010102713253000 Removed files: popt.gitignore Log: drop .gitignore Summary: RevisionChanges Path 1.2 +0 -53 popt/.gitignore rm -f popt/.gitignore <<'@@ .' Index: popt/.gitignore [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
