[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ Makefile.am l...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 14-Jun-2017 00:25:23
Branch: rpm-5_4 Handle: 2017061322252201
Added files: (Branch: rpm-5_4)
rpm/rpmio rpmeio.c rpmeio.h
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio Makefile.am librpmio.vers poptIO.c rpmio.c tmq.c
Log:
- rpmeio: stub in libeio wrapper(s).
Summary:
RevisionChanges Path
1.3501.2.577+1 -0 rpm/CHANGES
2.472.2.175 +76 -0 rpm/configure.ac
1.293.2.91 +19 -5 rpm/rpmio/Makefile.am
2.199.2.91 +61 -0 rpm/rpmio/librpmio.vers
1.94.2.39 +3 -0 rpm/rpmio/poptIO.c
1.1.2.1 +607 -0 rpm/rpmio/rpmeio.c
1.1.2.1 +248 -0 rpm/rpmio/rpmeio.h
1.230.2.60 +1 -0 rpm/rpmio/rpmio.c
1.1.2.22+268 -156 rpm/rpmio/tmq.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.576 -r1.3501.2.577 CHANGES
--- rpm/CHANGES 12 Jun 2017 06:54:06 - 1.3501.2.576
+++ rpm/CHANGES 13 Jun 2017 22:25:22 - 1.3501.2.577
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: rpmeio: stub in libeio wrapper(s).
- jbj: rpmev: stub in libev wrapper(s).
- jbj: rpmio: add rpmioB2N/rpmioN2B to display/set bit soup.
- jbj: rpmio: rename rpmio{Fts,Open}Flags.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.174 -r2.472.2.175 configure.ac
--- rpm/configure.ac 12 Jun 2017 06:54:06 - 2.472.2.174
+++ rpm/configure.ac 13 Jun 2017 22:25:22 - 2.472.2.175
@@ -5181,6 +5181,82 @@
AC_CHECK_FUNCS(ev_version_minor)
], [])
+dnl # libeio
+RPM_CHECK_LIB(
+[Libeio], [libeio],
+[ev-eio], [eio_init], [eio.h],
+[no,external:none], [],
+[
+AC_CHECK_FUNCS(eio_busy)
+AC_CHECK_FUNCS(eio_cancel)
+AC_CHECK_FUNCS(eio_chmod)
+AC_CHECK_FUNCS(eio_chown)
+AC_CHECK_FUNCS(eio_close)
+AC_CHECK_FUNCS(eio_custom)
+AC_CHECK_FUNCS(eio_dup2)
+AC_CHECK_FUNCS(eio_fallocate)
+AC_CHECK_FUNCS(eio_fchmod)
+AC_CHECK_FUNCS(eio_fchown)
+AC_CHECK_FUNCS(eio_fdatasync)
+AC_CHECK_FUNCS(eio_fstat)
+AC_CHECK_FUNCS(eio_fstatvfs)
+AC_CHECK_FUNCS(eio_fsync)
+AC_CHECK_FUNCS(eio_ftruncate)
+AC_CHECK_FUNCS(eio_futime)
+AC_CHECK_FUNCS(eio_grp)
+AC_CHECK_FUNCS(eio_grp_add)
+AC_CHECK_FUNCS(eio_grp_cancel)
+AC_CHECK_FUNCS(eio_grp_feed)
+AC_CHECK_FUNCS(eio_grp_limit)
+AC_CHECK_FUNCS(eio_init)
+AC_CHECK_FUNCS(eio_link)
+AC_CHECK_FUNCS(eio_lstat)
+AC_CHECK_FUNCS(eio_mkdir)
+AC_CHECK_FUNCS(eio_mknod)
+AC_CHECK_FUNCS(eio_mlock)
+AC_CHECK_FUNCS(eio_mlockall)
+AC_CHECK_FUNCS(eio_msync)
+AC_CHECK_FUNCS(eio_mtouch)
+AC_CHECK_FUNCS(eio_nop)
+AC_CHECK_FUNCS(eio_npending)
+AC_CHECK_FUNCS(eio_nready)
+AC_CHECK_FUNCS(eio_nreqs)
+AC_CHECK_FUNCS(eio_nthreads)
+AC_CHECK_FUNCS(eio_open)
+AC_CHECK_FUNCS(eio_poll)
+AC_CHECK_FUNCS(eio_read)
+AC_CHECK_FUNCS(eio_readahead)
+AC_CHECK_FUNCS(eio_readdir)
+AC_CHECK_FUNCS(eio_readlink)
+AC_CHECK_FUNCS(eio_realpath)
+AC_CHECK_FUNCS(eio_rename)
+AC_CHECK_FUNCS(eio_rmdir)
+AC_CHECK_FUNCS(eio_seek)
+AC_CHECK_FUNCS(eio_sendfile)
+AC_CHECK_FUNCS(eio_sendfile_sync)
+AC_CHECK_FUNCS(eio_set_idle_timeout)
+AC_CHECK_FUNCS(eio_set_max_idle)
+AC_CHECK_FUNCS(eio_set_max_parallel)
+AC_CHECK_FUNCS(eio_set_max_poll_reqs)
+AC_CHECK_FUNCS(eio_set_max_poll_time)
+AC_CHECK_FUNCS(eio_set_min_parallel)
+AC_CHECK_FUNCS(eio_stat)
+AC_CHECK_FUNCS(eio_statvfs)
+AC_CHECK_FUNCS(eio_submit)
+AC_CHECK_FUNCS(eio_symlink)
+AC_CHECK_FUNCS(eio_sync)
+AC_CHECK_FUNCS(eio_sync_file_range)
+AC_CHECK_FUNCS(eio_syncfs)
+AC_CHECK_FUNCS(eio_truncate)
+AC_CHECK_FUNCS(eio_unlink)
+AC_CHECK_FUNCS(eio_utime)
+AC_CHECK_FUNCS(eio_wd_close)
+AC_CHECK_FUNCS(eio_wd_close_sync)
+AC_CHECK_FUNCS(eio_wd_open)
+AC_CHECK_
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/misc/ Makefile.am rp...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 12-Jun-2017 08:54:07
Branch: rpm-5_4 Handle: 2017061206540600
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/miscMakefile.am
rpm/rpmio Makefile.am librpmio.vers poptIO.c rpmev.h rpmio.c
rpmio.h rpmio_internal.h tmq.c
Log:
- rpmev: stub in libev wrapper(s).
Summary:
RevisionChanges Path
1.3501.2.576+1 -0 rpm/CHANGES
2.472.2.174 +600 -5 rpm/configure.ac
1.56.2.18 +12 -2 rpm/misc/Makefile.am
1.293.2.90 +2 -1 rpm/rpmio/Makefile.am
2.199.2.89 +8 -0 rpm/rpmio/librpmio.vers
1.94.2.37 +3 -0 rpm/rpmio/poptIO.c
1.1.2.3 +14 -0 rpm/rpmio/rpmev.h
1.230.2.59 +2 -32 rpm/rpmio/rpmio.c
1.97.2.24 +0 -5 rpm/rpmio/rpmio.h
2.127.2.17 +0 -2 rpm/rpmio/rpmio_internal.h
1.1.2.20+14 -346rpm/rpmio/tmq.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.575 -r1.3501.2.576 CHANGES
--- rpm/CHANGES 10 Jun 2017 00:22:35 - 1.3501.2.575
+++ rpm/CHANGES 12 Jun 2017 06:54:06 - 1.3501.2.576
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: rpmev: stub in libev wrapper(s).
- jbj: rpmio: add rpmioB2N/rpmioN2B to display/set bit soup.
- jbj: rpmio: rename rpmio{Fts,Open}Flags.
- jbj: rpmio: add rpmio{Mount,Umount}Flags.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.173 -r2.472.2.174 configure.ac
--- rpm/configure.ac 30 May 2017 19:18:38 - 2.472.2.173
+++ rpm/configure.ac 12 Jun 2017 06:54:06 - 2.472.2.174
@@ -2253,15 +2253,12 @@
fi
HAVE_RPM_COMPRESSION=yes
], [])
-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 # Facebook Zstd
RPM_CHECK_LIB(
[Facebook Zstd], [zstd],
[zstd], [ZSTD_versionNumber], [zstd.h],
-[no,external:none], [],
+[no,external:internal:none], [zstd:lib:lib],
[
AC_CHECK_FUNCS(COVER_optimizeTrainFromBuffer)
AC_CHECK_FUNCS(COVER_trainFromBuffer)
@@ -2406,8 +2403,154 @@
AC_CHECK_FUNCS(ZSTD_sizeof_DStream)
AC_CHECK_FUNCS(ZSTD_versionNumber)
AC_CHECK_FUNCS(ZSTD_versionString)
+ HAVE_RPM_COMPRESSION=yes
+], [])
+
+dnl # Google Brotli
+RPM_CHECK_LIB(
+[Google Brotli], [brotli],
+[brotli], [XXX], [version.h],
+[no,internal:external:none], [brotli:c/include],
+[
], [])
+dnl # Google Snappy
+RPM_CHECK_LIB(
+[Google Snappy], [snappy],
+[snappy], [snappy_compress], [snappy-c.h],
+[no,external:internal:none], [snappy],
+[
+AC_CHECK_FUNCS(snappy_compress)
+AC_CHECK_FUNCS(snappy_max_compressed_length)
+AC_CHECK_FUNCS(snappy_uncompress)
+AC_CHECK_FUNCS(snappy_uncompressed_length)
+AC_CHECK_FUNCS(snappy_validate_compressed_buffer)
+], [])
+
+dnl # Apple Lzfse
+RPM_CHECK_LIB(
+[Apple Lzfse], [lzfse],
+[lzfse], [lzfse_encode_init], [lzfse.h],
+[no,internal:external:none], [lzfse:src],
+[
+], [])
+
+dnl # LZ4
+RPM_CHECK_LIB(
+[LZ4], [lz4],
+[lz4], [LZ4_versionNumber], [lz4.h],
+[no,external:internal:none], [lz4:lib],
+[
+AC_CHECK_FUNCS(LZ4_compress)
+AC_CHECK_FUNCS(LZ4_compressBound)
+AC_CHECK_FUNCS(LZ4_compress_continue)
+AC_CHECK_FUNCS(LZ4_compress_default)
+AC_CHECK_FUNCS(LZ4_compress_destSize)
+AC_CHECK_FUNCS(LZ4_compress_fast)
+AC_CHECK_FUNCS(LZ4_compress_fast_continue)
+AC_CHECK_FUNCS(LZ4_compress_fast_extState)
+AC_CHECK_FUNCS(LZ4_compress_fast_force)
+AC_CHECK_FUNCS(LZ4_compress_forceExtDict)
+AC_CHECK_FUNCS(LZ4_compressHC)
+AC_CHECK_FUNCS(LZ4_compress_HC)
+AC_CHECK_FUNCS(LZ4_compressHC2)
+AC_CHECK_FUNCS(LZ4_compressHC2_continue)
+AC_CHECK_FUNCS(LZ4_compressHC2_limitedOutput)
+AC_CHECK_FUNCS(LZ4_compressHC2_limitedOutput_continue)
+
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ poptALL.c rpm/r...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 20-May-2017 21:21:07 Branch: rpm-5_4 Handle: 2017052019210700 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/lib poptALL.c rpm/rpmio librpmio.vers msqio.c poptIO.c poptIO.h rpmio.h rpmmsq.h tmq.c Log: - rpmmsq: permit building --without-msq. - rpmmsq: add per-executable and per-rpm message queue id's. Summary: RevisionChanges Path 1.3501.2.553+2 -0 rpm/CHANGES 2.472.2.172 +20 -7 rpm/configure.ac 2.144.2.19 +7 -1 rpm/lib/poptALL.c 2.199.2.77 +2 -0 rpm/rpmio/librpmio.vers 1.1.2.3 +76 -20 rpm/rpmio/msqio.c 1.94.2.29 +9 -1 rpm/rpmio/poptIO.c 1.8.4.4 +2 -2 rpm/rpmio/poptIO.h 1.97.2.18 +3 -0 rpm/rpmio/rpmio.h 1.1.2.3 +0 -2 rpm/rpmio/rpmmsq.h 1.1.2.3 +1 -1 rpm/rpmio/tmq.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.552 -r1.3501.2.553 CHANGES --- rpm/CHANGES 20 May 2017 16:30:10 - 1.3501.2.552 +++ rpm/CHANGES 20 May 2017 19:21:07 - 1.3501.2.553 @@ -1,4 +1,6 @@ 5.4.17 -> 5.4.18: +- jbj: rpmmsq: permit building --without-msq. +- jbj: rpmmsq: add per-executable and per-rpm message queue id's. - jbj: rpmmsq: use pool allocation. permit queue deletion. - jbj: rpmio: add ".msqio" to send/receive SysV messages. - jbj: rpmsw: use clock_gettime (if available). @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.171 -r2.472.2.172 configure.ac --- rpm/configure.ac 13 May 2017 07:03:14 - 2.472.2.171 +++ rpm/configure.ac 20 May 2017 19:21:07 - 2.472.2.172 @@ -1373,19 +1373,15 @@ dnl # oddball system calls AC_CHECK_HEADERS(sys/syscall.h) +AC_CHECK_HEADERS(linux/memfd.h) +AC_CHECK_FUNCS(memfd_create) AC_CHECK_HEADERS(linux/random.h) AC_CHECK_FUNCS(getentropy) AC_CHECK_FUNCS(getrandom) AC_CHECK_FUNCS(splice tee vmsplice) -AC_CHECK_HEADERS(linux/memfd.h) -AC_CHECK_FUNCS(memfd_create) - -AC_CHECK_HEADERS(sched.h) AC_CHECK_FUNCS(clone setns unshare) -AC_CHECK_HEADERS(linux/kcmp.h) -AC_CHECK_FUNCS(kcmp) AC_CHECK_FUNCS(fadvise posix_fadvise) AC_CHECK_FUNCS(fallocate posix_fallocate) @@ -4183,7 +4179,7 @@ RPM_CHECK_LIB( [POSIX Message Queues in RT], [mq], [rt], [mq_open], [mqueue.h], -[no,external:none], [], +[yes,external:none], [], [ $(echo "$OLIBS" | grep -- ' -lrt' > /dev/null) && LIBS="$OLIBS" AC_CHECK_FUNCS(mq_close) AC_CHECK_FUNCS(mq_getattr) @@ -4197,6 +4193,21 @@ AC_CHECK_FUNCS(mq_unlink) ], []) +dnl # SysV Message Queues +OLIBS="$LIBS" +RPM_CHECK_LIB( +[SysV Message Queues in C], [msq], +[c], [msgget], [sys/msg.h], +[yes,external:none], [], +[ LIBS="$OLIBS" +AC_CHECK_HEADERS(sys/ipc.h) +AC_CHECK_FUNCS(ftok) +AC_CHECK_FUNCS(msgctl) +AC_CHECK_FUNCS(msgget) +AC_CHECK_FUNCS(msgrcv) +AC_CHECK_FUNCS(msgsnd) +], []) + dnl # MOUNT OLIBS="$LIBS" RPM_CHECK_LIB( @@ -4308,6 +4319,8 @@ [c], [sched_yield], [sched.h], [yes,external:none], [], [ LIBS="$OLIBS" +AC_CHECK_HEADERS(linux/kcmp.h) +AC_CHECK_FUNCS(kcmp) AC_CHECK_FUNCS(sched_getaffinity) AC_CHECK_FUNCS(sched_setaffinity) AC_CHECK_FUNCS(sched_getparam) @@ . patch -p0 <<'@@ .' Index: rpm/lib/poptALL.c $ cvs diff -u -r2.144.2.18 -r2.144.2.19 poptALL.c --- rpm/lib/poptALL.c 16 May 2017 18:29:10 - 2.144.2.18 +++ rpm/lib/poptALL.c 20 May 2017 19:21:07 - 2.144.2.19 @@ -4,7 +4,10 @@ */ #include "system.h" -extern const char *__progname; + +#if defined(HAVE_SYS_IPC_H) +# include +#endif #if defined(RPM_VENDOR_WINDRIVER) const char *__usrlibrpm = USRLIBRPM; @@ -579,6 +582,9 @@ int i; rpmioMtrace(); +#if defined(HAVE_FTOK) +__progname_key = ftok(arg0, __progname_projid); +#endif rpmioInitUsage(RPMLOG_DEBUG, __FUNCTION__); setprogname(arg0); /* Retrofit glibc __progname */ @@ . patch -p0
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ poptALL.c rpm/r...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 13-May-2017 09:03:15 Branch: rpm-5_4 Handle: 2017051307031401 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/lib poptALL.c rpm/rpmio librpmio.vers macro.c poptIO.c poptIO.h rpmcap.c rpmcap.h Log: - poptALL: spew info for rpm itself with -vv. - poptIO: spew info for rpm utilities with -vv. Summary: RevisionChanges Path 1.3501.2.549+2 -0 rpm/CHANGES 2.472.2.171 +280 -74rpm/configure.ac 2.144.2.17 +10 -3 rpm/lib/poptALL.c 2.199.2.74 +5 -0 rpm/rpmio/librpmio.vers 2.249.2.43 +364 -243 rpm/rpmio/macro.c 1.94.2.26 +158 -4 rpm/rpmio/poptIO.c 1.8.4.2 +32 -10 rpm/rpmio/poptIO.h 1.1.2.3 +30 -26 rpm/rpmio/rpmcap.c 1.1.2.3 +1 -1 rpm/rpmio/rpmcap.h patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.548 -r1.3501.2.549 CHANGES --- rpm/CHANGES 10 May 2017 21:39:09 - 1.3501.2.548 +++ rpm/CHANGES 13 May 2017 07:03:14 - 1.3501.2.549 @@ -1,4 +1,6 @@ 5.4.17 -> 5.4.18: +- jbj: poptALL: spew info for rpm itself with -vv. +- jbj: poptIO: spew info for rpm utilities with -vv. - jbj: mcheck: link -lmcheck to enable, wrap mtrace et al in rpmio. - jbj: bsd: use getmode/setmode/strmode from glibc -lbsd (if possible). - jbj: capng: stub in process capabilities support. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.170 -r2.472.2.171 configure.ac --- rpm/configure.ac 11 May 2017 16:24:23 - 2.472.2.170 +++ rpm/configure.ac 13 May 2017 07:03:14 - 2.472.2.171 @@ -1378,7 +1378,6 @@ AC_CHECK_FUNCS(getrandom) AC_CHECK_FUNCS(splice tee vmsplice) -AC_CHECK_FUNCS(sendfile) AC_CHECK_HEADERS(linux/memfd.h) AC_CHECK_FUNCS(memfd_create) @@ -1425,10 +1424,6 @@ dnl # API AC_CHECK_HEADERS(cpuid.h) -dnl # API -AC_CHECK_HEADERS(elf.h sys/procfs.h sys/cdefs.h sys/auxv.h) -AC_CHECK_FUNCS(getauxval) - dnl # tries to retrofit an assert(x) macro AC_CHECK_HEADERS(assert.h) @@ -1635,7 +1630,6 @@ setattrlist fsetattrlist dnl pathconf fpathconf dnl truncate ftruncate dnl -getrlimit setrlimit prlimit dnl realpath dnl dnl statvfs fstavfs dnl @@ -1650,7 +1644,7 @@ symlink symlinkat dnl clearenv putenv setenv unsetenv secure_getenv __secure_getenv dnl dnl -signal signalfd dnl +signal strsignal dnl kill killpg dnl tkill tgkill dnl pause dnl @@ -1670,7 +1664,16 @@ dnl socket dnl dnl -wait waitpid waitid wait3 wait4 dnl +getgid getegid getresgid dnl +setgid setegid setregid setresgid dnl +getuid geteuid getresuid dnl +setuid seteuid setreuid setresuid dnl +getpgid getpgrp tcgetpgrp dnl +setpgid setpgrp tcsetpgrp dnl +getsid dnl +setsid dnl +dnl +getpid getppid dnl dnl getaddrinfo freeaddrinfo gai_strerror dnl getnameinfo dnl @@ -1680,8 +1683,6 @@ inet_addr inet_network inet_makeaddr inet_lnaof inet_netof dnl dnl syslog vsyslog openlog closelog setlogmask dnl -dnlsetproctitle setproctitle_init dnl -getrusage getpriority setpriority nice dnl dnl basename dirname dnl confstr dnl @@ -1703,8 +1704,6 @@ getmntinfo getmntinfo_r dnl uname dnl dnl -poll ppoll dnl -select pselect dnl mkdtemp dnl mkstemp mkstemps dnl mkostemp mkostemps dnl @@ -3816,10 +3815,31 @@ fi ], []) +dnl # ACCT +OLIBS="$LIBS" +RPM_CHECK_LIB( +[ACCT], [acct], +[c], [acct], [sys/acct.h], +[no,external:none], [], +[ LIBS="$OLIBS" +], []) + +dnl # ACL + +dnl # AUXV +OLIBS="$LIBS" +RPM_CHECK_LIB( +[AUXV], [auxv], +[c], [getauxval], [sys/auxv.h], +[yes,external:none], [], +[ LIBS="$OLIBS" +AC_CHECK_HEADERS(elf.h sys/procfs.h sys/cdefs.h) +], []) + dnl # Glibc AIO OLIBS="$LIBS" RPM_CHECK_LIB( -[Glibc AIO], [aio], +[Glibc AIO in RT], [aio], [rt], [aio_init], [aio.h], [no,external:none], [], [ $(echo "$OLIBS" | grep -- ' -lrt' > /dev/null) && LIBS="$OLIBS" @@
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ poptALL.c rpm/r...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 10-May-2017 23:39:09 Branch: rpm-5_4 Handle: 2017051021390900 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/lib poptALL.c rpm/rpmio librpmio.vers poptIO.c rpmmalloc.c Log: - mcheck: link -lmcheck to enable, wrap mtrace et al in rpmio. Summary: RevisionChanges Path 1.3501.2.548+1 -0 rpm/CHANGES 2.472.2.169 +5 -4 rpm/configure.ac 2.144.2.16 +15 -112rpm/lib/poptALL.c 2.199.2.73 +13 -0 rpm/rpmio/librpmio.vers 1.94.2.25 +6 -10 rpm/rpmio/poptIO.c 1.29.2.5+178 -54rpm/rpmio/rpmmalloc.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.547 -r1.3501.2.548 CHANGES --- rpm/CHANGES 10 May 2017 16:59:43 - 1.3501.2.547 +++ rpm/CHANGES 10 May 2017 21:39:09 - 1.3501.2.548 @@ -1,4 +1,5 @@ 5.4.17 -> 5.4.18: +- jbj: mcheck: link -lmcheck to enable, wrap mtrace et al in rpmio. - jbj: bsd: use getmode/setmode/strmode from glibc -lbsd (if possible). - jbj: capng: stub in process capabilities support. - jbj: bsd: use setproctitle from glibc -lbsd (if possible). @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.168 -r2.472.2.169 configure.ac --- rpm/configure.ac 10 May 2017 16:57:56 - 2.472.2.168 +++ rpm/configure.ac 10 May 2017 21:39:09 - 2.472.2.169 @@ -1734,7 +1734,7 @@ dnl # glibc malloc info/check/tracing. AC_CHECK_HEADERS(malloc.h) AC_CHECK_FUNCS(malloc calloc realloc free cfree memalign valloc pvalloc) -AC_CHECK_FUNCS(mallopt malloc_trim malloc_usable_size malloc_stats) +AC_CHECK_FUNCS(mallopt) AC_CHECK_MEMBERS([ struct mallinfo.arena, struct mallinfo.ordblks, @@ -1749,7 +1749,8 @@ [ AC_DEFINE(HAVE_STRUCT_MALLINFO, 1, [Define as 1 if you have "struct mallinfo" (only glibc?)]) ], [], [#include ]) -AC_CHECK_FUNCS(mallinfo) +AC_CHECK_FUNCS(malloc_trim malloc_usable_size malloc_stats) +AC_CHECK_FUNCS(malloc_info) AC_CHECK_FUNCS(malloc_get_state malloc_set_state) AC_CHECK_FUNCS(__default_morecore __malloc_check_init) AC_CHECK_FUNCS(posix_memalign) @@ -4067,8 +4068,8 @@ [Glibc MEMCHECK], [mcheck], [c], [mcheck], [mcheck.h], [yes,external:none], [], -[ LIBS="$OLIBS" -AC_CHECK_FUNCS(mcheck) dnl used in rpmqv.c +[ LIBS="$OLIBS -lmcheck" +AC_CHECK_FUNCS(mcheck) AC_CHECK_FUNCS(mcheck_pedantic) AC_CHECK_FUNCS(mcheck_check_all) AC_CHECK_FUNCS(mprobe) @@ . patch -p0 <<'@@ .' Index: rpm/lib/poptALL.c $ cvs diff -u -r2.144.2.15 -r2.144.2.16 poptALL.c --- rpm/lib/poptALL.c 21 Apr 2017 06:19:16 - 2.144.2.15 +++ rpm/lib/poptALL.c 10 May 2017 21:39:09 - 2.144.2.16 @@ -59,7 +59,6 @@ #endif /* __cplusplus */ -/*@unchecked@*/ /*@only@*/ /*@null@*/ extern unsigned int * keyids; #define POPT_SHOWVERSION -999 @@ -68,116 +67,77 @@ #define POPT_PREDEFINE -996 #define POPT_UNDEFINE-994 -/*@access headerTagIndices @*/ /* XXX rpmcliFini */ -/*@access headerTagTableEntry @*//* XXX rpmcliFini */ - -/*@unchecked@*/ static int _debug = 0; -/*@-exportheadervar@*/ -/*@unchecked@*/ extern int _rpmds_nopromote; -/*@unchecked@*/ extern int _fps_debug; -/*@unchecked@*/ extern int _fsm_debug; -/*@unchecked@*/ extern int _fsm_threads; -/*@unchecked@*/ extern int _hdr_debug; -/*@unchecked@*/ extern int _hdrqf_debug; -/*@unchecked@*/ extern int _pkgio_debug; -/*@unchecked@*/ extern int _rpmrepo_debug; -/*@unchecked@*/ extern int _print_pkts; -/*@unchecked@*/ extern int _rpmpsm_debug; -/*@unchecked@*/ extern int _psm_threads; -/*@unchecked@*/ extern int _rpmal_debug; -/*@unchecked@*/ extern int _rpmds_debug; -/*@unchecked@*/ int _rpmfc_debug; -/*@unchecked@*/ extern int _rpmfi_debug; -/*@unchecked@*/ extern int _rpmgi_debug; -/*@unchecked@*/ extern int _rpmmi_debug; -/*@unchecked@*/ extern int _rpmps_debug; -/*@unchecked@
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ poptALL.c rpm/r...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Apr-2017 08:19:16
Branch: rpm-5_4 Handle: 2017042106191600
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/lib poptALL.c
rpm/rpmio librpmio.vers rpmio.h rpmrpc.c
Log:
- autofu: refactor to add
--with-{epoll,eventfd,fanotify,inotify,ipc,mount,personality,prctl,timerfd}.
- rpmio: add getauxval+personality.
Summary:
RevisionChanges Path
1.3501.2.537+2 -0 rpm/CHANGES
2.472.2.163 +118 -14rpm/configure.ac
2.144.2.15 +0 -1 rpm/lib/poptALL.c
2.199.2.70 +2 -0 rpm/rpmio/librpmio.vers
1.97.2.14 +10 -0 rpm/rpmio/rpmio.h
2.99.2.10 +156 -1 rpm/rpmio/rpmrpc.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.536 -r1.3501.2.537 CHANGES
--- rpm/CHANGES 21 Apr 2017 02:59:12 - 1.3501.2.536
+++ rpm/CHANGES 21 Apr 2017 06:19:16 - 1.3501.2.537
@@ -1,4 +1,6 @@
5.4.17 -> 5.4.18:
+- jbj: autofu: refactor to add
--with-{epoll,eventfd,fanotify,inotify,ipc,mount,personality,prctl,timerfd}.
+- jbj: rpmio: add getauxval+personality.
- jbj: autofu: refactor to add
--with-{aio,clock,mq,sched,search,sem,shm,timer,xattr,attr,cap,acl,keyutils}
subsystem detection build options.
- jbj: rpmio: add memfd_create+add_key+request_key+keyctl syscalls.
- jbj: rpmio: add fgetxattr+flistxattr+fremovexattr+fsetxattr
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.162 -r2.472.2.163 configure.ac
--- rpm/configure.ac 21 Apr 2017 02:58:43 - 2.472.2.162
+++ rpm/configure.ac 21 Apr 2017 06:19:16 - 2.472.2.163
@@ -1299,7 +1299,7 @@
stddef.h stdint.h stdlib.h string.h strings.h dnl
sys/acl.h sys/byteorder.h sys/endian.h sys/file.h dnl
sys/ioctl.h sys/ipc.h sys/mman.h sys/mntctl.h sys/mnttab.h dnl
-sys/mount.h sys/param.h sys/prctl.h sys/resource.h dnl
+sys/mount.h sys/param.h sys/resource.h dnl
sys/select.h sys/socket.h sys/statfs.h sys/statvfs.h dnl
sys/stdtypes.h sys/systemcfg.h sys/time.h sys/timeb.h sys/types.h dnl
sys/utsname.h sys/vfs.h sys/vmount.h sys/xattr.h sys/wait.h dnl
@@ -1400,9 +1400,6 @@
AC_CHECK_FUNCS(remap_file_pages)
AC_CHECK_FUNCS(syncfs)
-AC_CHECK_HEADERS(sys/prctl.h)
-AC_CHECK_FUNCS(prctl)
-
# Find the best function to set timestamps.
AC_CHECK_FUNCS(utime gettimeofday localtime_r tzset)
AC_CHECK_FUNCS(utimes lutimes futimes futimesat)
@@ -1436,9 +1433,9 @@
dnl # API
AC_CHECK_HEADERS(cpuid.h)
-dnl # API
-AC_CHECK_HEADERS(sys/getauxv.h)
-AC_CHECK_FUNC(getauxv)
+dnl # API
+AC_CHECK_HEADERS(elf.h sys/procfs.h sys/cdefs.h sys/auxv.h sys/getauxv.h)
+AC_CHECK_FUNCS(getauxval getauxv)
dnl # tries to retrofit an assert(x) macro
AC_CHECK_HEADERS(assert.h)
@@ -1636,21 +1633,27 @@
dnl
atexit dnl
getcwd getwd get_current_dir_name dnl
+stat fstat lstat fstatat dnl
+umask getumask dnl
chdir fchdir dnl
-chmod fchmod lchmod dnl
+chmod fchmod lchmod fchmodat dnl
chown fchown lchown dnl
chflags fchflags lchflags dnl
getattrlist fgetattrlist getattrlistat dnl
setattrlist fsetattrlist dnl
pathconf fpathconf dnl
truncate ftruncate dnl
+getrlimit setrlimit prlimit dnl
realpath dnl
floor pow sqrt dnl
dnl
+statvfs fstavfs dnl
+dnl
dup dup2 dup3 dnl
link linkat dnl
mkdir mkdirat dnl
mkfifo mkfifoat dnl
+mknod mknodat dnl
open openat creat dnl
rmdir dnl
symlink symlinkat dnl
@@ -1662,11 +1665,12 @@
pause dnl
raise dnl
sigaction sigpending sigreturn sigsuspend sigtimedwait dnl
-sigpause dnl
sigprocmask pthread_sigmask dnl
+sigpause dnl
sigqueue pthread_sigqueue dnl
sigwait sigwaitinfo dnl
sigemptyset sigfillset sigaddset sigdelset sigismember dnl
+sigisemptyset sigorset sigandset dnl
sigset sighold sigrelse sigignore dnl
sigvec sigmask sigblock siggetmask sigsetmask dnl
dnl
@@ -1677,21 +1681,27 @@
getaddrinfo freeaddrinfo gai_strerror dnl
getnameinfo dnl
inet_aton inet_ntoa dnl
+inet_pton inet_ntop inet_net_pton dnl
inet_addr inet_network inet_makeaddr
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ librpmio.vers...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Apr-2017 04:58:44
Branch: rpm-5_4 Handle: 2017042102584301
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio librpmio.vers rpmdefs.h rpmio.c rpmio.h
rpmio_internal.h rpmrpc.c
rpm/tools rpmdigest.c rpmmtree.c
Log:
- autofu: refactor to add
--with-{aio,clock,mq,sched,search,sem,shm,timer,xattr,attr,cap,acl,keyutils}
subsystem detection build options.
- rpmio: add memfd_create+add_key+request_key+keyctl syscalls.
Summary:
RevisionChanges Path
1.3501.2.535+2 -0 rpm/CHANGES
2.472.2.162 +402 -48rpm/configure.ac
2.199.2.69 +1 -0 rpm/rpmio/librpmio.vers
1.1.2.4 +2 -0 rpm/rpmio/rpmdefs.h
1.230.2.43 +22 -0 rpm/rpmio/rpmio.c
1.97.2.13 +5 -0 rpm/rpmio/rpmio.h
2.127.2.12 +3 -0 rpm/rpmio/rpmio_internal.h
2.99.2.9+210 -327 rpm/rpmio/rpmrpc.c
2.18.4.7+1 -1 rpm/tools/rpmdigest.c
2.17.2.9+2 -2 rpm/tools/rpmmtree.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.534 -r1.3501.2.535 CHANGES
--- rpm/CHANGES 19 Apr 2017 20:42:14 - 1.3501.2.534
+++ rpm/CHANGES 21 Apr 2017 02:58:43 - 1.3501.2.535
@@ -1,4 +1,6 @@
5.4.17 -> 5.4.18:
+- jbj: autofu: refactor to add
--with-{aio,clock,mq,sched,search,sem,shm,timer,xattr,attr,cap,acl,keyutils}
subsystem detection build options.
+- jbj: rpmio: add memfd_create.
- jbj: rpmio: add fgetxattr+flistxattr+fremovexattr+fsetxattr
- jbj: rpmio: add getrandom+getentropy
- jbj: rpmio: add syncfs+ftruncate+futimens
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.161 -r2.472.2.162 configure.ac
--- rpm/configure.ac 19 Apr 2017 20:42:14 - 2.472.2.161
+++ rpm/configure.ac 21 Apr 2017 02:58:43 - 2.472.2.162
@@ -1301,8 +1301,8 @@
sys/ioctl.h sys/ipc.h sys/mman.h sys/mntctl.h sys/mnttab.h dnl
sys/mount.h sys/param.h sys/prctl.h sys/resource.h dnl
sys/select.h sys/socket.h sys/statfs.h sys/statvfs.h dnl
-sys/stdtypes.h sys/systemcfg.h sys/time.h sys/timeb.h dnl
-sys/types.h sys/utsname.h sys/vfs.h sys/vmount.h sys/wait.h dnl
+sys/stdtypes.h sys/systemcfg.h sys/time.h sys/timeb.h sys/types.h dnl
+sys/utsname.h sys/vfs.h sys/vmount.h sys/xattr.h sys/wait.h dnl
syslog.h termio.h termios.h unistd.h utime.h utmp.h utmpx.h dnl
wchar.h dnl
])
@@ -1355,22 +1355,58 @@
AC_CHECK_FUNC(socket,[], [ AC_CHECK_LIB(socket, socket) ])
dnl # specific functions (for linking against *external* Berkeley-DB under
Solaris)
-AC_CHECK_FUNC(fdatasync, [], [ AC_CHECK_LIB(rt, fdatasync) ])
-AC_CHECK_FUNC(sched_yield, [], [ AC_CHECK_LIB(rt, sched_yield) ])
-AC_CHECK_FUNC(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime) ])
+AC_CHECK_FUNC(fdatasync, [], [ AC_CHECK_LIB(rt, fdatasync) ])
+AC_CHECK_FUNC(sched_yield,[], [ AC_CHECK_LIB(rt, sched_yield) ])
+AC_CHECK_FUNC(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime) ])
dnl # specific functions (generic)
-AC_CHECK_FUNCS(vsnprintf snprintf)
+AC_CHECK_FUNCS(fclose fdopen fopen fread freopen fwrite)
+AC_CHECK_FUNCS(fgetc fgets getc getchar ungetc)
+AC_CHECK_FUNCS(getdelim getline)
+AC_CHECK_FUNCS(asprintf dprintf fprintf printf sprintf snprintf)
+AC_CHECK_FUNCS(vasprintf vdprintf vfprintf vprintf vsprintf vsnprintf)
AC_CHECK_FUNCS(strcoll strverscmp)
dnl # Error API
AC_CHECK_HEADERS(error.h)
-AC_CHECK_FUNCS(error)
+AC_CHECK_FUNCS(error error_at_line)
-dnl # linux getrandom(2) and OpenBSD getentropy(2) syscalls
-AC_CHECK_HEADERS(sys/syscall.h linux/random.h)
-AC_CHECK_FUNCS(getrandom)
+dnl # oddball system calls
+AC_CHECK_HEADERS(sys/syscall.h)
+AC_CHECK_HEADERS(linux/random.h)
AC_CHECK_FUNCS(getentropy)
+AC_CHECK_FUNCS(getrandom)
+
+AC_CHECK_FUNCS(splice tee vmsplice)
+AC_CHECK_FUNCS(sendfile)
+
+AC_CHECK_HEADERS(sys/memfd.h)
+AC_CHECK_FUNCS(memfd_create)
+
+AC_CHECK_HEADERS(sched.h linux/kcmp.h)
+AC_CHECK_FUNCS(clone kcmp setns unshare)
+
+AC_CHECK_HEADERS(sys/mman.h)
+AC_CHECK_FUNCS(mincore mprotect mremap msync munmap)
+AC_CHECK_FUNCS(mlock munlock mlockall)
+
+AC_CHECK_FUNCS(fadvise posix_fad
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ fsm.c psm.c rpm...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 19-Apr-2017 22:42:15 Branch: rpm-5_4 Handle: 2017041920421401 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/lib fsm.c psm.c rpm/rpmio iosm.c librpmio.vers rpmio.c rpmio.h rpmio_internal.h Log: - rpmio: add fgetxattr+flistxattr+fremovexattr+fsetxattr - rpmio: add getrandom+getentropy - rpmio: add syncfs+ftruncate+futimens Summary: RevisionChanges Path 1.3501.2.534+3 -0 rpm/CHANGES 2.472.2.161 +12 -5 rpm/configure.ac 2.193.4.15 +1 -1 rpm/lib/fsm.c 2.399.2.23 +2 -2 rpm/lib/psm.c 1.43.2.12 +2 -2 rpm/rpmio/iosm.c 2.199.2.68 +6 -0 rpm/rpmio/librpmio.vers 1.230.2.42 +277 -83rpm/rpmio/rpmio.c 1.97.2.12 +33 -1 rpm/rpmio/rpmio.h 2.127.2.11 +115 -48rpm/rpmio/rpmio_internal.h patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.533 -r1.3501.2.534 CHANGES --- rpm/CHANGES 18 Apr 2017 11:14:41 - 1.3501.2.533 +++ rpm/CHANGES 19 Apr 2017 20:42:14 - 1.3501.2.534 @@ -1,4 +1,7 @@ 5.4.17 -> 5.4.18: +- jbj: rpmio: add fgetxattr+flistxattr+fremovexattr+fsetxattr +- jbj: rpmio: add getrandom+getentropy +- jbj: rpmio: add syncfs+ftruncate+futimens - jbj: rpmio: add fchdir+fchmod+fchown+fincore+flock+futimes. - jbj: rpmio: add fallocate+fdatasync+fadvise+fsync. - jbj: install: use clock_gettime/gettimeofday/time for *.rpm timestamps. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.160 -r2.472.2.161 configure.ac --- rpm/configure.ac 17 Apr 2017 18:19:07 - 2.472.2.160 +++ rpm/configure.ac 19 Apr 2017 20:42:14 - 2.472.2.161 @@ -1367,6 +1367,11 @@ AC_CHECK_HEADERS(error.h) AC_CHECK_FUNCS(error) +dnl # linux getrandom(2) and OpenBSD getentropy(2) syscalls +AC_CHECK_HEADERS(sys/syscall.h linux/random.h) +AC_CHECK_FUNCS(getrandom) +AC_CHECK_FUNCS(getentropy) + dnl # POSIX search(3) API AC_CHECK_HEADERS(search.h) AC_CHECK_FUNC(insque, [], [ AC_CHECK_LIB(compat, insque) ]) @@ -1413,7 +1418,7 @@ dnl # platform-hack: The Mac OS X (aka Darwin) ld(1) uses a strange dnl # non-standard Unix library search path order. This causes great dnl # problems when linking against the third-party libraries. -dnl # Force ld(1) to stick standard Unix search path order. +dnl # Force ld(1) to stick to standard Unix search path order. case "$host" in *-*-darwin* ) LDFLAGS="$LDFLAGS -Wl,-search_paths_first" ;; esac @@ -1574,23 +1579,25 @@ AC_CHECK_FUNCS([dnl asprintf atexit basename chflags clearenv clock_gettime clone dnl confstr dup2 endgrent endpwent fallocate fchdir fchflags dnl -fchmod fdatasync floor ftok fsync ftruncate getaddrinfo dnl +fchmod fdatasync fgetxattr flistxattr floor fremovexattr dnl +fsetxattr fsync ftok ftruncate getaddrinfo dnl getattrlist getcwd getdelim gethostbyaddr gethostbyname dnl gethostname getline getmode getmntent getmntinfo dnl getnameinfo getpass getpassphrase gettimeofday getwd dnl getxattr hasmntopt iconv inet_aton inet_ntoa isascii dnl lchflags lchmod lchown lgetxattr localtime_r lsetxattr dnl lutimes madvise mbrlen memchr mempcpy memset mincore mkdir dnl -mkdtemp mkfifo mkstemp msync mtrace munmap nl_langinfo dnl +mkdtemp mkfifo mkstemp mremap msync mtrace munmap nl_langinfo dnl pathconf posix_fadvise posix_fallocate posix_madvise posix_memalign dnl posix_memalign posix_mem_offset posix_typed_mem_open dnl -pow prctl putenv realpath regcomp rmdir rpmatch __secure_getenv secure_getenv dnl +pow prctl putenv realpath regcomp rmdir rpmatch dnl +__secure_getenv secure_getenv dnl select sendfile setattrlist setenv setmode setns setxattr dnl sigaction sigaddset sigdelset sigemptyset sighold sigpause dnl sigprocmask sigrelse sigsuspend setlocale socket splice sqrt dnl stpcpy stpncpy strcspn strdup strerror strmode dnl strncasecmp strndup strpbrk strspn strstr strtol strtoul strtoull dnl -tee tzset uname unshare vmsplice dnl +syncfs tee tzset uname unshare vmsplice dnl ]) dnl # specific additional tests needed to replace Berkeley-DB db_con
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ fsm.c rpmts.c r...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Apr-2017 20:19:08
Branch: rpm-5_4 Handle: 2017041718190701
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/lib fsm.c rpmts.c rpmts.h
rpm/rpmdb librpmdb.vers pkgio.c
rpm/rpmio iosm.c iosm.h librpmio.vers rpmio.c rpmio.h
rpmio_internal.h rpmrpc.c
Log:
- rpmio: add fallocate+fdatasync+fadvise+fsync.
Summary:
RevisionChanges Path
1.3501.2.532+1 -0 rpm/CHANGES
2.472.2.160 +2 -1 rpm/configure.ac
2.193.4.13 +29 -13 rpm/lib/fsm.c
2.188.2.20 +4 -1 rpm/lib/rpmts.c
2.134.2.10 +12 -3 rpm/lib/rpmts.h
1.91.2.5+1 -0 rpm/rpmdb/librpmdb.vers
1.121.2.28 +9 -0 rpm/rpmdb/pkgio.c
1.43.2.10 +87 -27 rpm/rpmio/iosm.c
1.18.4.5+6 -1 rpm/rpmio/iosm.h
2.199.2.66 +13 -0 rpm/rpmio/librpmio.vers
1.230.2.39 +189 -3 rpm/rpmio/rpmio.c
1.97.2.10 +65 -0 rpm/rpmio/rpmio.h
2.127.2.8 +101 -46rpm/rpmio/rpmio_internal.h
2.99.2.6+347 -111 rpm/rpmio/rpmrpc.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.531 -r1.3501.2.532 CHANGES
--- rpm/CHANGES 11 Apr 2017 17:36:58 - 1.3501.2.531
+++ rpm/CHANGES 17 Apr 2017 18:19:07 - 1.3501.2.532
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: rpmio: add fallocate+fdatasync+fadvise+fsync.
- jbj: install: use clock_gettime/gettimeofday/time for *.rpm timestamps.
- jbj: build: add usecs to RPMTAG_BUILDTIME/RPMTAG_COOKIE.
- jbj: header: minor optimization for headerGet().
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.159 -r2.472.2.160 configure.ac
--- rpm/configure.ac 13 Apr 2017 15:19:23 - 2.472.2.159
+++ rpm/configure.ac 17 Apr 2017 18:19:07 - 2.472.2.160
@@ -686,6 +686,7 @@
AC_ARG_ENABLE(build-sanitize-address,
AS_HELP_STRING([--enable-build-sanitize-address], [build RPM
instrumented for -fsanitize=address]), [dnl
if test ".$enableval" = .yes; then
+export ASAN_OPTIONS="detect_leaks=0"
if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then
rpm_CPPFLAGS_ADD([-fsanitize=address], [CPPFLAGS])
rpm_LDFLAGS_ADD([-fsanitize=address], [LDFLAGS])
@@ -1583,7 +1584,7 @@
mkdtemp mkfifo mkstemp msync mtrace munmap nl_langinfo dnl
pathconf posix_fadvise posix_fallocate posix_madvise posix_memalign dnl
posix_memalign posix_mem_offset posix_typed_mem_open dnl
-pow putenv realpath regcomp rmdir rpmatch __secure_getenv secure_getenv
dnl
+pow prctl putenv realpath regcomp rmdir rpmatch __secure_getenv
secure_getenv dnl
select sendfile setattrlist setenv setmode setns setxattr dnl
sigaction sigaddset sigdelset sigemptyset sighold sigpause dnl
sigprocmask sigrelse sigsuspend setlocale socket splice sqrt dnl
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
$ cvs diff -u -r2.193.4.12 -r2.193.4.13 fsm.c
--- rpm/lib/fsm.c 6 Jul 2016 13:20:42 - 2.193.4.12
+++ rpm/lib/fsm.c 17 Apr 2017 18:19:07 - 2.193.4.13
@@ -147,7 +147,7 @@
if (iter) {
iter->fi = rpmfiUnlink(iter->fi, "mapIterator");
/*@-internalglobs@*/ /* XXX rpmswExit() */
- (void)rpmtsFree(iter->ts);
+ (void) rpmtsFree(iter->ts);
iter->ts = NULL;
/*@=internalglobs@*/
}
@@ -557,6 +557,7 @@
IOSM_t newFSM(void)
{
IOSM_t fsm = (IOSM_t) xcalloc(1, sizeof(*fsm));
+fsm->stats = xcalloc(1, sizeof(*fsm->stats));
return fsm;
}
@@ -572,6 +573,7 @@
fsm->dnlx = _free(fsm->dnlx);
fsm->ldn = _free(fsm->ldn);
fsm->iter = mapFreeIterator(fsm->iter);
+ fsm->stats = _free(fsm->stats);
}
return _free(fsm);
}
@@ -764,10 +766,15 @@
if (!rc)
rc = fsmUNSAFE(fsm, IOSM_DESTROY);
-(void) rpmswAdd(rpmtsOp(fsmGetTs(fsm), RPMTS_OP_DIGEST),
&fsm->op_digest);
+/* XXX eliminate when ts->stats is printed. */
+(void) rpmswAdd(rpmtsOp(fsmGetTs(fsm), RPMTS_OP_DIGEST),
&fsm->stats->ops[FDSTAT_DIGEST]);
+FDSTAT_t stats = (FDSTAT_t) rpmtsStats(fsmGetTs(fsm));
+if (stats)
+
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ digest.c libr...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 06-Mar-2017 18:52:55
Branch: rpm-5_4 Handle: 2017030617525401
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio digest.c librpmio.vers rpmiotypes.h
rpm/tools debugedit.c
Log:
- debugedit: upgrade to handle resizable elf section.
Summary:
RevisionChanges Path
1.3501.2.525+1 -0 rpm/CHANGES
2.472.2.158 +18 -2 rpm/configure.ac
2.93.2.10 +5 -0 rpm/rpmio/digest.c
2.199.2.65 +1 -0 rpm/rpmio/librpmio.vers
1.47.2.23 +10 -0 rpm/rpmio/rpmiotypes.h
2.23.2.20 +1405 -399 rpm/tools/debugedit.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.524 -r1.3501.2.525 CHANGES
--- rpm/CHANGES 5 Mar 2017 18:06:24 - 1.3501.2.524
+++ rpm/CHANGES 6 Mar 2017 17:52:54 - 1.3501.2.525
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: debugedit: upgrade to handle resizable elf section.
- jbj: debugedit: sync changes before upgrading.
- jbj: header: fix: test args before immutable region trailer memcpy
(PLD).
- jbj: fix: filter EEXIST and use rpmlog on tmpdir creation (ticket #97).
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.157 -r2.472.2.158 configure.ac
--- rpm/configure.ac 16 Jan 2017 18:58:06 - 2.472.2.157
+++ rpm/configure.ac 6 Mar 2017 17:52:54 - 2.472.2.158
@@ -1728,7 +1728,7 @@
AC_ARG_WITH(libelf, AS_HELP_STRING([--with-libelf], [use libelf/gelf API]), [
if test ".$withval" = .yes; then
AC_MSG_RESULT(yes)
-AC_CHECK_HEADERS([libelf.h gelf.h])
+AC_CHECK_HEADERS([libelf.h gelf.h dwarf.h elfutils/libdwelf.h])
if test ".$ac_cv_header_libelf_h" = .no; then
dnl # on Solaris is incompatible with LFS. If we
couldn't
dnl # include , see if we can when _FILE_OFFSET_BITS is
@@ -1778,7 +1778,8 @@
AC_MSG_RESULT(no)
])
fi
-if test ".$ac_cv_header_gelf_h" = .yes; then
+if test \( ".$ac_cv_header_gelf_h" = .yes \) -a \
+\( ".$ac_cv_header_dwarf_h" = .yes \); then
AC_CHECK_LIB([elf], [elf_version], [
AC_CHECK_LIB([elf], [gelf_getvernaux], [
AC_DEFINE(HAVE_GELF_GETVERNAUX, 1, [Define to 1 if you
have the gelf_getvernaux() function.])
@@ -1790,6 +1791,21 @@
WITH_LIBELF_DEBUGEDIT="debugedit"
LIBS="$LIBS -lelf"
])
+if test ".$ac_cv_header_elfutils_libdwelf_h" = .yes; then
+dnl # dwelf_elf_gnu_build_id was introduced in elfutils 0.159
+AC_CHECK_LIB([dw], [dwelf_elf_gnu_build_id], [
+# If possible we also want the strtab functions from
elfutils 0.167.
+# But we can fall back on the (unsupported) ebl
alternatives if not.
+LIBS="$LIBS -ldw"
+AC_CHECK_LIB([dw], [dwelf_strtab_init], [
+AC_DEFINE(HAVE_LIBDW_STRTAB, 1, [Define to 1 if you
have the dwelf_strtab_init() function.])
+],[
+LIBS="$LIBS -lebl"
+])
+],[
+AC_MSG_ERROR([elfutils does not have
dwelf_elf_gnu_build_id()])
+])
+fi
else
AC_MSG_ERROR([libelf/gelf API requested but not found or not
usable])
fi
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/digest.c
$ cvs diff -u -r2.93.2.9 -r2.93.2.10 digest.c
--- rpm/rpmio/digest.c16 Jul 2016 14:40:26 - 2.93.2.9
+++ rpm/rpmio/digest.c6 Mar 2017 17:52:54 - 2.93.2.10
@@ -182,6 +182,11 @@
return (ctx != NULL ? ctx->name : "UNKNOWN");
}
+size_t rpmDigestSize(DIGEST_CTX ctx)
+{
+return (ctx != NULL ? ctx->digestsize : 0);
+}
+
const char * rpmDigestASN1(DIGEST_CTX ctx)
{
return (ctx != NULL ? ctx->asn1 : NULL);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.199.2.64 -r2.199.2.65 librpmio.vers
--- rpm/rpmio
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ rpmmqtt.c rpm...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 11-Jul-2016 22:26:53
Branch: rpm-5_4 Handle: 2016071120265300
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio rpmmqtt.c rpmmqtt.h tmqtt.c
Log:
- mqtt: add a WITH_MOSQUITTO implementation.
Summary:
RevisionChanges Path
1.3501.2.516+1 -0 rpm/CHANGES
2.472.2.153 +20 -2 rpm/configure.ac
1.1.2.20+1790 -347 rpm/rpmio/rpmmqtt.c
1.1.2.18+134 -22rpm/rpmio/rpmmqtt.h
1.1.2.13+5 -6 rpm/rpmio/tmqtt.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.515 -r1.3501.2.516 CHANGES
--- rpm/CHANGES 7 Jul 2016 14:34:56 - 1.3501.2.515
+++ rpm/CHANGES 11 Jul 2016 20:26:53 - 1.3501.2.516
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: mqtt: add a WITH_MOSQUITTO implementation.
- jbj: blake2: upgrade to 20160619 release.
- jbj: macros: stub-in rpmmc/rpmme pools for MacroContext/MacroEntry.
- jbj: mqtt: prepare for MacroContext sub-classing.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.152 -r2.472.2.153 configure.ac
--- rpm/configure.ac 29 Jun 2016 12:17:57 - 2.472.2.152
+++ rpm/configure.ac 11 Jul 2016 20:26:53 - 2.472.2.153
@@ -2246,10 +2246,28 @@
# MQTT
RPM_CHECK_LIB(
-[MQTT], [mqtt],
+[Paho], [paho],
[paho-mqtt3as], [MQTTAsync_create], [MQTTAsync.h],
[no,external:none], [],
-[ AC_DEFINE(WITH_MQTT, 1, [Define if building with MQTT])
+[ AC_DEFINE(WITH_PAHO, 1, [Define if building with MQTT+PAHO])
+], [])
+RPM_CHECK_LIB(
+[Mosquitto], [mosquitto],
+[mosquitto], [mosquitto_lib_init], [mosquitto.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_MOSQUITTO, 1, [Define if building with MQTT+MOSQUITTO])
+], [])
+RPM_CHECK_LIB(
+[RabbitMQ], [rabbitmq],
+[rabbitmq], [amqp_new_connection], [amqp.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_RABBITMQ, 1, [Define if building with MQTT+RABBITMQ])
+], [])
+RPM_CHECK_LIB(
+[ZeroMQ], [zeromq],
+[zmq], [zmq_ctx_new], [zmq.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_ZEROMQ, 1, [Define if building with MQTT+ZEROMQ])
], [])
# Libgit2
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmqtt.c
$ cvs diff -u -r1.1.2.19 -r1.1.2.20 rpmmqtt.c
--- rpm/rpmio/rpmmqtt.c 10 Jul 2016 16:16:04 - 1.1.2.19
+++ rpm/rpmio/rpmmqtt.c 11 Jul 2016 20:26:53 - 1.1.2.20
@@ -3,6 +3,15 @@
*/
#include "system.h"
+
+#undef WITH_PAHO
+#undef WITH_RABBITMQ
+#undef WITH_ZEROMQ
+
+#if defined(WITH_PAHO) || defined(WITH_MOSQUITTO) || defined(WITH_RABBITMQ)
|| defined(WITH_ZEROMQ)
+#define WITH_MQTT
+#endif
+
#include
#include
#include
@@ -19,17 +28,25 @@
#include
#include
-#ifdef WITH_MQTT
+#ifdef WITH_PAHO
#include
#endif
+#ifdef WITH_MOSQUITTO
+#include
+#endif
+#ifdef WITH_RABBITMQ
+#include
+#endif
+#ifdef WITH_ZEROMQ
+#include
+#endif
#define _RPMMQTT_INTERNAL
#include
#include "debug.h"
-int _rpmmqtt_debug = 1;
-#define SPEW(_list) if (mqtt->debug || _rpmmqtt_debug < 0) fprintf _list
+int _rpmmqtt_debug;
#define F_ISSET(_f, _FLAG) (((_f) & ((MQTT_FLAGS_##_FLAG) & ~0x4000)) !=
MQTT_FLAGS_NONE)
#define MF_ISSET(_FLAG) F_ISSET(mqtt->flags, _FLAG)
@@ -121,8 +138,8 @@
return t;
}
-#define _ENTRY(_v) { MQTT_FLAGS_##_v, #_v, }
static KEY MqttFlags[] = {
+#define _ENTRY(_v) { MQTT_FLAGS_##_v, #_v, }
_ENTRY(CLEAN),
_ENTRY(EOL),
_ENTRY(NOSTALE),
@@ -133,8 +150,8 @@
_ENTRY(RETAIN),
_ENTRY(WILL_RETAIN),
_ENTRY(BUFFER),
-};
#undef _ENTRY
+};
static size_t nMqttFlags = sizeof(MqttFlags) / sizeof(MqttFlags[0]);
static const char * fmtMqttFlags(uint32_t flags)
@@ -146,33 +163,10 @@
}
#define _MQTTFLAGS(_flags) fmtMqttFlags(_flags)
-#define _ENTRY(_v) { MQTTASYNC_##_v, #_v, }
-static KEY rpmmqtt_errs[] = {
-#ifdef WITH_MQTT
-_ENTRY(SUCCESS),
-_ENTRY(FAILURE),
-_ENTRY(P
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ .cvsignore m...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 29-Jun-2016 14:17:58
Branch: rpm-5_4 Handle: 2016062912175701
Added files: (Branch: rpm-5_4)
rpm/macros mqtt.in
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/macros .cvsignore macros.in
rpm/rpmio rpmmqtt.c rpmmqtt.h rpmurl.h tmqtt.c url.c
Log:
- mqtt: add self-subscriptions and macro configgery.
Summary:
RevisionChanges Path
1.3501.2.509+1 -0 rpm/CHANGES
2.472.2.152 +3 -2 rpm/configure.ac
1.4.2.3 +1 -0 rpm/macros/.cvsignore
1.39.2.50 +5 -1 rpm/macros/macros.in
1.1.2.1 +13 -0 rpm/macros/mqtt.in
1.1.2.5 +364 -124 rpm/rpmio/rpmmqtt.c
1.1.2.5 +3 -2 rpm/rpmio/rpmmqtt.h
1.41.4.10 +1 -0 rpm/rpmio/rpmurl.h
1.1.2.3 +18 -3 rpm/rpmio/tmqtt.c
1.73.4.16 +4 -0 rpm/rpmio/url.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.508 -r1.3501.2.509 CHANGES
--- rpm/CHANGES 29 Jun 2016 09:58:39 - 1.3501.2.508
+++ rpm/CHANGES 29 Jun 2016 12:17:57 - 1.3501.2.509
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: mqtt: add self-subscriptions and macro configgery.
- jbj: macro: add primitives useful for log spewage.
- jbj: mqtt: stub-in a paho-mqtt client.
- jbj: build: add/use RPMIOPOOL_ macros where possible.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.151 -r2.472.2.152 configure.ac
--- rpm/configure.ac 27 Jun 2016 18:27:10 - 2.472.2.151
+++ rpm/configure.ac 29 Jun 2016 12:17:57 - 2.472.2.152
@@ -2247,7 +2247,7 @@
# MQTT
RPM_CHECK_LIB(
[MQTT], [mqtt],
-[paho-mqtt3c], [MQTTClient_create], [MQTTClient.h],
+[paho-mqtt3as], [MQTTAsync_create], [MQTTAsync.h],
[no,external:none], [],
[ AC_DEFINE(WITH_MQTT, 1, [Define if building with MQTT])
], [])
@@ -3372,7 +3372,8 @@
rpmdb/DB_CONFIG
macros/macros macros/macros.rpmbuild
macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
-macros/mandriva macros/suse macros/fedora macros/mono macros/perl
macros/pkgconfig macros/php
+macros/mandriva macros/suse macros/fedora macros/mono macros/mqtt
+macros/perl macros/pkgconfig macros/php
macros/python macros/ruby macros/selinux macros/tcl
lua/tests/Makefile lua/tests/libs/Makefile
doc/Makefile
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/.cvsignore
$ cvs diff -u -r1.4.2.2 -r1.4.2.3 .cvsignore
--- rpm/macros/.cvsignore 15 Aug 2011 20:36:23 - 1.4.2.2
+++ rpm/macros/.cvsignore 29 Jun 2016 12:17:58 - 1.4.2.3
@@ -8,6 +8,7 @@
macros.rpmbuild
mandriva
mono
+mqtt
perl
php
pkgconfig
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.39.2.49 -r1.39.2.50 macros.in
--- rpm/macros/macros.in 8 May 2016 18:33:29 - 1.39.2.49
+++ rpm/macros/macros.in 29 Jun 2016 12:17:58 - 1.39.2.50
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.49 2016/05/08 18:33:29 jbj Exp $
+# $Id: macros.in,v 1.39.2.50 2016/06/29 12:17:58 jbj 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
@@ -1057,6 +1057,10 @@
# rpmbuild macros.
%{load:%{_usrlibrpm}/macros.rpmbuild}
+#==
+# MQTT macros.
+%{load:%{_usrlibrpm}/macros.d/mqtt}
+
#
# cmake(...) configuration
#%%{load:%{_usrlibrpm}/macros.d/cmake}
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/mqtt.in
$ cvs diff -u -r0 -r1.1.2.1 mqtt.in
--- /dev/null 2016-06-29 14:15:40.0 +0200
+++ mqtt.in 2016-06-29 14:17:58.615621809 +0200
@@ -0,0 +1,13 @@
+#=
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ rpmmqtt.c rpm...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Jun-2016 20:27:10
Branch: rpm-5_4 Handle: 2016062718271000
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio rpmmqtt.c rpmmqtt.h
Log:
- mqtt: stub-in a paho-mqtt client.
Summary:
RevisionChanges Path
1.3501.2.507+2 -0 rpm/CHANGES
2.472.2.151 +8 -0 rpm/configure.ac
1.1.2.2 +166 -2 rpm/rpmio/rpmmqtt.c
1.1.2.2 +11 -1 rpm/rpmio/rpmmqtt.h
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.506 -r1.3501.2.507 CHANGES
--- rpm/CHANGES 27 Jun 2016 03:10:03 - 1.3501.2.506
+++ rpm/CHANGES 27 Jun 2016 18:27:10 - 1.3501.2.507
@@ -1,4 +1,6 @@
5.4.17 -> 5.4.18:
+- jbj: mqtt: stub-in a paho-mqtt client.
+- jbj: build: add/use RPMIOPOOL_ macros where possible.
- jbj: lib: add/use RPMIOPOOL_ macros where possible.
- jbj: rpmdb: add/use RPMIOPOOL_ macros where possible.
- jbj: rpmdb: rename dbiIndex -> rpmdbi type, dbiFoo() -> rpmdbiFoo().
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.150 -r2.472.2.151 configure.ac
--- rpm/configure.ac 24 Jun 2016 19:08:22 - 2.472.2.150
+++ rpm/configure.ac 27 Jun 2016 18:27:10 - 2.472.2.151
@@ -2244,6 +2244,14 @@
fi
], [ AC_MSG_WARN([No Neon library found, using unsupported
configuration]) ])
+# MQTT
+RPM_CHECK_LIB(
+[MQTT], [mqtt],
+[paho-mqtt3c], [MQTTClient_create], [MQTTClient.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_MQTT, 1, [Define if building with MQTT])
+], [])
+
# Libgit2
# XXX internal needs *.a/*.la files to merge into -lrpmmisc
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmqtt.c
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmmqtt.c
--- rpm/rpmio/rpmmqtt.c 27 Jun 2016 03:05:58 - 1.1.2.1
+++ rpm/rpmio/rpmmqtt.c 27 Jun 2016 18:27:10 - 1.1.2.2
@@ -3,6 +3,9 @@
*/
#include "system.h"
+#include
+#include
+#include
#include/* for *Pool methods */
#include
@@ -12,20 +15,91 @@
#include "debug.h"
+int _rpmmqtt_debug = 0;
+
+static int Xcheck(rpmmqtt mqtt, const char * msg, int rc,
+ int printit, const char * func, const char * fn, unsigned ln)
+{
+
+if (printit || rc) {
+ fprintf(stderr, "error: %s:%s:%u: MQTTClient_%s(%d)\n",
+ func, fn, ln, msg, rc);
+}
+return rc;
+}
+#define check(_o, _m, _rc) \
+Xcheck(_o, _m, _rc, _rpmmqtt_debug, __FUNCTION__, __FILE__, __LINE__)
+
static void rpmmqttFini(void * _mqtt)
{
rpmmqtt mqtt = (rpmmqtt) _mqtt;
+#ifdef WITH_MQTT
+{MQTTClient C = (MQTTClient) mqtt->C;
+ int xx;
+ mqtt->msecs = 1;
+ xx = check(mqtt, "disconnect",
+ MQTTClient_disconnect(C, mqtt->msecs));
+ MQTTClient_destroy(&C);
+}
+#endif
+mqtt->C = NULL;
+
if (mqtt->av)
(void) argvFree((ARGV_t)mqtt->av);
mqtt->av = NULL;
mqtt->flags = 0;
}
-int _rpmmqtt_debug = 0;
-
RPMIOPOOL_MODULE(mqtt)
+static int rpmmqttMessageArrived(void * _mqtt, char * topic, int topicLen,
+ void * _message)
+{
+rpmmqtt mqtt = (rpmmqtt) _mqtt;
+FILE * fp = stderr;
+int rc = 1;
+
+(void)mqtt;
+
+fprintf(fp, "Message arrived\n");
+fprintf(fp, " topic: %s\n", topic);
+
+#ifdef WITH_MQTT
+MQTTClient_message *message = _message;
+const char * s = message->payload;
+
+fprintf(fp, " message: ");
+for (int i = 0; i < message->payloadlen; i++)
+fprintf(fp, "%c", s[i]);
+fprintf(fp, "\n");
+
+MQTTClient_freeMessage(&message);
+MQTTClient_free(topic);
+#endif
+
+return rc;
+}
+
+static void rpmmqttDeliveryComplete(void * _mqtt, int token)
+{
+rpmmqtt mqtt = (rpmmqtt) _mqtt;
+FILE * fp = stderr;
+fprintf(fp, "Message with token value %d delivery confirmed\n", token);
+mqtt->token = token;
+}
+
+static void rpmmqttConnlost(void * _mqtt, char *cause)
+{
+rpmmqtt mqtt = (rpmmqtt) _mqtt;
+FILE * fp = stderr;
+
+
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ rpmsx.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 24-Jun-2016 21:08:23 Branch: rpm-5_4 Handle: 2016062419082201 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/rpmio rpmsx.c Log: - selinux: use rpm_execcon only if available. Summary: RevisionChanges Path 1.3501.2.497+1 -0 rpm/CHANGES 2.472.2.150 +3 -0 rpm/configure.ac 2.4.4.5 +4 -0 rpm/rpmio/rpmsx.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.496 -r1.3501.2.497 CHANGES --- rpm/CHANGES 24 Jun 2016 19:04:18 - 1.3501.2.496 +++ rpm/CHANGES 24 Jun 2016 19:08:22 - 1.3501.2.497 @@ -1,4 +1,5 @@ 5.4.17 -> 5.4.18: +- jbj: selinux: use rpm_execcon only if available. - jbj: use poptArgvFree to avoid memory leaks. - jbj: autofu: don't bother carrying around install-sh/mkinstalldirs. - jbj: autofu: default db-utils seaches to $PATH. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.149 -r2.472.2.150 configure.ac --- rpm/configure.ac 22 Jun 2016 22:48:32 - 2.472.2.149 +++ rpm/configure.ac 24 Jun 2016 19:08:22 - 2.472.2.150 @@ -2173,6 +2173,9 @@ [selinux], [is_selinux_enabled], [selinux/selinux.h], [no,external:none], [], [ AC_DEFINE(WITH_SELINUX, 1, [Define if building with Libselinux]) + AC_CHECK_LIB([selinux], [rpm_execcon], [ + AC_DEFINE(HAVE_SELINUX_RPM_EXECCON, 1, [Define to 1 if you have the rpm_execcon() function.]) + ]) ], []) dnl # Libsepol @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmsx.c $ cvs diff -u -r2.4.4.4 -r2.4.4.5 rpmsx.c --- rpm/rpmio/rpmsx.c 9 Sep 2014 17:12:08 - 2.4.4.4 +++ rpm/rpmio/rpmsx.c 24 Jun 2016 19:08:23 - 2.4.4.5 @@ -300,7 +300,11 @@ SPEW((stderr, "--> %s(%p,%d,%p)\n", __FUNCTION__, sx, verified, argv)); #if defined(WITH_SELINUX) +#if defined(HAVE_SELINUX_RPM_EXECCON) rc = rpm_execcon(verified, argv[0], (char *const *)argv, environ); +#else +rc = execvpe(argv[0], (char *const *)argv, environ); +#endif #endif SPEW((stderr, "<-- %s(%p,%d,%p) rc %d\n", __FUNCTION__, sx, verified, argv, rc)); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 23-Jun-2016 00:48:32
Branch: rpm-5_4 Handle: 201606483200
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
- autofu: default db-utils seaches to $PATH.
Summary:
RevisionChanges Path
1.3501.2.495+1 -0 rpm/CHANGES
2.472.2.149 +16 -16 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.494 -r1.3501.2.495 CHANGES
--- rpm/CHANGES 19 Jun 2016 08:53:45 - 1.3501.2.494
+++ rpm/CHANGES 22 Jun 2016 22:48:32 - 1.3501.2.495
@@ -1,4 +1,5 @@
5.4.17 -> 5.4.18:
+- jbj: autofu: default db-utils seaches to $PATH.
- jbj: gnulib: stub in include from gnulib/*.h before /usr/include.
- jbj: gnulib: stub in merge gnulib -> librpmmisc.
- jbj: cygwin: fix: move glob/fnmatch from rpmio->misc to remove linkage
loops.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.148 -r2.472.2.149 configure.ac
--- rpm/configure.ac 19 Jun 2016 08:53:46 - 2.472.2.148
+++ rpm/configure.ac 22 Jun 2016 22:48:32 - 2.472.2.149
@@ -1098,22 +1098,22 @@
AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
-AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive,
$MYPATH)
-AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint,
%{_bindir}/${DBXY}_checkpoint, $MYPATH)
-AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock,
$MYPATH)
-AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
-AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup,
%{_bindir}/${DBXY}_hotbackup, $MYPATH)
-AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
-AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify,
%{_bindir}/${DBXY}_log_verify, $MYPATH)
-AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog,
$MYPATH)
-AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover,
$MYPATH)
-AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate,
%{_bindir}/${DBXY}_replicate, $MYPATH)
-AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH)
-AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen,
%{_bindir}/${DBXY}_sql_codegen, $MYPATH)
-AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
-AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH)
-AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade,
$MYPATH)
-AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
+AC_PATH_PROGS(__DB_ARCHIVE, [${DBXY}_archive db_archive], db_archive,
$MYPATH)
+AC_PATH_PROGS(__DB_CHECKPOINT, [${DBXY}_checkpoint db_checkpoint],
db_checkpoint, $MYPATH)
+AC_PATH_PROGS(__DB_DEADLOCK, [${DBXY}_deadlock db_deadlock], db_deadlock,
$MYPATH)
+AC_PATH_PROGS(__DB_DUMP, [${DBXY}_dump db_dump], db_dump, $MYPATH)
+AC_PATH_PROGS(__DB_HOTBACKUP, [${DBXY}_hotbackup db_hootbackup],
db_hotbackup, $MYPATH)
+AC_PATH_PROGS(__DB_LOAD, [${DBXY}_load db_load], db_load, $MYPATH)
+AC_PATH_PROGS(__DB_LOG_VERIFY, [${DBXY}_log_verify db_log_verify],
db_log_verify, $MYPATH)
+AC_PATH_PROGS(__DB_PRINTLOG, [${DBXY}_printlog db_printlog], db_printlog,
$MYPATH)
+AC_PATH_PROGS(__DB_RECOVER, [${DBXY}_recover db_recover], db_recover,
$MYPATH)
+AC_PATH_PROGS(__DB_REPLICATE, [${DBXY}_replicate db_replicate],
db_replicate, $MYPATH)
+AC_PATH_PROGS(__DBSQL, [${DBXY}sql dbsql], dbsql, $MYPATH)
+AC_PATH_PROGS(__DB_SQL_CODEGEN, [${DBXY}_sql_codegen db_sql_codegen],
db_sql_codegen, $MYPATH)
+AC_PATH_PROGS(__DB_STAT, [${DBXY}_stat db_stat], db_stat, $MYPATH)
+AC_PATH_PROGS(__DB_TUNER, [${DBXY}_tuner db_tuner], db_tuner, $MYPATH)
+AC_PATH_PROGS(__DB_UPGRADE, [${DBXY}_upgrade db_upgrade], db_upgrade,
$MYPATH)
+AC_PATH_PROGS(__DB_VERIFY, [${DBXY}_verify db_verify], db_verify, $MYPATH)
AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 12-May-2016 22:09:26 Branch: rpm-5_4 Handle: 2016051220092600 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start rpm-5.4.18 development. Summary: RevisionChanges Path 1.3501.2.489+3 -0 rpm/CHANGES 2.472.2.144 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.488 -r1.3501.2.489 CHANGES --- rpm/CHANGES 8 May 2016 19:24:22 - 1.3501.2.488 +++ rpm/CHANGES 12 May 2016 20:09:26 - 1.3501.2.489 @@ -1,3 +1,6 @@ +5.4.17 -> 5.4.18: +- jbj: start rpm-5.4.18 development. + 5.4.16 -> 5.4.17: - jbj: i18n: add yandex automated translations. - jbj: db: make peace with db-6.1.26/db-6.2.23 (db +PATCH is needed). @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.143 -r2.472.2.144 configure.ac --- rpm/configure.ac 8 May 2016 18:33:29 - 2.472.2.143 +++ rpm/configure.ac 12 May 2016 20:09:26 - 2.472.2.144 @@ -8,8 +8,8 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.17],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2016-04-21" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.18],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2016-05-12" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ macros.in rp...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 08-May-2016 20:33:30
Branch: rpm-5_4 Handle: 2016050818332900
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/macros macros.in
rpm/rpmdb db3.c
Log:
- db: make peace with db-6.1.26/db-6.2.23 (db +PATCH is needed).
- db: fix: change thread_count from 64 -> 4096 for db-6.1.26 and later.
Summary:
RevisionChanges Path
1.3501.2.487+2 -0 rpm/CHANGES
2.472.2.143 +3 -3 rpm/configure.ac
1.39.2.49 +2 -2 rpm/macros/macros.in
1.156.2.27 +1 -0 rpm/rpmdb/db3.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.486 -r1.3501.2.487 CHANGES
--- rpm/CHANGES 24 Apr 2016 18:13:21 - 1.3501.2.486
+++ rpm/CHANGES 8 May 2016 18:33:29 - 1.3501.2.487
@@ -1,4 +1,6 @@
5.4.16 -> 5.4.17:
+- jbj: db: make peace with db-6.1.26/db-6.2.23 (db +PATCH is needed).
+- jbj: db: fix: change thread_count from 64 -> 4096 for db-6.1.26 and
later.
- jbj: sasl2: change to "opt-in" instead as "opt-out" default.
- jbj: pkgio: fix: verify type/count for RPMSIGTAG_MD5.
- jbj: python: add symlinks so that python module can be loaded.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.142 -r2.472.2.143 configure.ac
--- rpm/configure.ac 24 Apr 2016 18:13:21 - 2.472.2.142
+++ rpm/configure.ac 8 May 2016 18:33:29 - 2.472.2.143
@@ -1079,7 +1079,7 @@
MYPATH=$PATH
fi
-DBXY=db61
+DBXY=db62
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
@@ -2293,7 +2293,7 @@
CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
-[db-6.1], [db_create], [db.h],
+[db-6.2], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
@@ -2319,7 +2319,7 @@
dnl # Sqlite 3.8.3.1 from db-6.1.19
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
-[db_sql-6.1], [sqlite3_open], [dbsql.h],
+[db_sql-6.2], [sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.39.2.48 -r1.39.2.49 macros.in
--- rpm/macros/macros.in 28 Mar 2016 19:15:02 - 1.39.2.48
+++ rpm/macros/macros.in 8 May 2016 18:33:29 - 1.39.2.49
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.48 2016/03/28 19:15:02 jbj Exp $
+# $Id: macros.in,v 1.39.2.49 2016/05/08 18:33:29 jbj 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
@@ -352,7 +352,7 @@
# Use Berkeley DB transaction logging for rpmdb ACID behavior.
# XXX the %{?__nofsync} is passed from the --nofsync popt alias on the rpm
cli.
-%__dbi_txn create %{?__nofsync:nofsync} lock log mpool txn multiversion
auto_commit thread thread_count=64
+%__dbi_txn create %{?__nofsync:nofsync} lock log mpool txn multiversion
auto_commit thread thread_count=4096
%__dbi_perms perms=0644
%__dbi_tmpdirtmpdir=%{_dbpath}/tmp
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
$ cvs diff -u -r1.156.2.26 -r1.156.2.27 db3.c
--- rpm/rpmdb/db3.c 20 Apr 2016 09:34:53 - 1.156.2.26
+++ rpm/rpmdb/db3.c 8 May 2016 18:33:29 - 1.156.2.27
@@ -1176,6 +1176,7 @@
/*@-noeffectuncon@*/
dbenv->set_msgfile(dbenv, rpmdb->db_errfile);
/*@=noeffectuncon@*/
+/* XXX FIXME: estimate thread_count range better. */
if (dbi->dbi_thread_count >= 8) {
xx = dbenv->set_thread_count(dbenv, dbi->dbi_thread_count);
xx = cvtdberr(dbi, "dbenv->set_thread_count", xx, _debug);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repository
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmdb/ pkgio.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 24-Apr-2016 20:13:22
Branch: rpm-5_4 Handle: 2016042418132101
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmdb pkgio.c
Log:
- sasl2: change to "opt-in" instead as "opt-out" default.
Summary:
RevisionChanges Path
1.3501.2.486+2 -0 rpm/CHANGES
2.472.2.142 +10 -1 rpm/configure.ac
1.121.2.26 +0 -1 rpm/rpmdb/pkgio.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.485 -r1.3501.2.486 CHANGES
--- rpm/CHANGES 21 Apr 2016 21:32:08 - 1.3501.2.485
+++ rpm/CHANGES 24 Apr 2016 18:13:21 - 1.3501.2.486
@@ -1,4 +1,6 @@
5.4.16 -> 5.4.17:
+- jbj: sasl2: change to "opt-in" instead as "opt-out" default.
+- jbj: pkgio: fix: verify type/count for RPMSIGTAG_MD5.
- jbj: python: add symlinks so that python module can be loaded.
- jbj: python: blueprint transaction.py wrapper against rpm-4.13.0.
- jbj: python: log interpreter values.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.141 -r2.472.2.142 configure.ac
--- rpm/configure.ac 21 Apr 2016 21:27:24 - 2.472.2.141
+++ rpm/configure.ac 24 Apr 2016 18:13:21 - 2.472.2.142
@@ -2149,7 +2149,7 @@
RPM_CHECK_LIB(
[Cyrus Libsasl2], [sasl2],
[sasl2], [sasl_client_init], [sasl/sasl.h],
-[yes,external:none], [],
+[no,external:none], [],
[ AC_DEFINE(WITH_SASL2, 1, [Define if building with Cyrus Libsasl2])
], [])
@@ -2487,6 +2487,15 @@
], [])
fi
+dnl # LibYAML (needed by the mrbgem mruby-yaml when builtin)
+RPM_CHECK_LIB(
+[YAML], [yaml],
+[yaml], [yaml_emitter_initialize], [yaml.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_MRBEMBED, 1, [Define to 1 if you want mruby with
mruby-yaml])
+], [])
+
+
dnl # MRuby
RPM_CHECK_LIB(
[MRuby], [mruby],
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/pkgio.c
$ cvs diff -u -r1.121.2.25 -r1.121.2.26 pkgio.c
--- rpm/rpmdb/pkgio.c 24 Apr 2016 17:00:03 - 1.121.2.25
+++ rpm/rpmdb/pkgio.c 24 Apr 2016 18:13:22 - 1.121.2.26
@@ -1035,7 +1035,6 @@
he->tag = (rpmTag) RPMSIGTAG_SIZE;
xx = headerGet(sigh, he, HEADERGET_SIGHEADER);
if (xx && he->t == RPM_UINT32_TYPE && he->c == 1) {
- /* XXX FIXME: there's an overrun here. */
size_t datasize = he->p.ui32p[0];
he->p.ptr = _free(he->p.ptr);
/* Print package component sizes. */
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 21-Apr-2016 23:27:24 Branch: rpm-5_4 Handle: 2016042121272400 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start rpm-5.4.17 development. Summary: RevisionChanges Path 1.3501.2.483+3 -0 rpm/CHANGES 2.472.2.141 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.482 -r1.3501.2.483 CHANGES --- rpm/CHANGES 15 Apr 2016 18:42:14 - 1.3501.2.482 +++ rpm/CHANGES 21 Apr 2016 21:27:24 - 1.3501.2.483 @@ -1,3 +1,6 @@ +5.4.16 -> 5.4.17: +- jbj: start rpm-5.4.17 development. + 5.4.15 -> 5.4.16: - jbj: pkgio: always verify hdr SHA1 if available. - jbj: header: fix: tighter checks on index entries and data. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.140 -r2.472.2.141 configure.ac --- rpm/configure.ac 20 Apr 2016 09:43:45 - 2.472.2.140 +++ rpm/configure.ac 21 Apr 2016 21:27:24 - 2.472.2.141 @@ -8,8 +8,8 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.16],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2016-04-15" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.17],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2016-04-21" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ rpmltc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Mar-2016 22:44:14
Branch: rpm-5_4 Handle: 2016031721441301
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio rpmltc.c
Log:
- ltc: fix: retrofit a #define for LTC_LTC_PKCS_1_V1_5 enum detection.
Summary:
RevisionChanges Path
1.3501.2.474+1 -0 rpm/CHANGES
2.472.2.135 +3 -0 rpm/configure.ac
1.2.4.14+2 -2 rpm/rpmio/rpmltc.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.473 -r1.3501.2.474 CHANGES
--- rpm/CHANGES 17 Mar 2016 20:11:19 - 1.3501.2.473
+++ rpm/CHANGES 17 Mar 2016 21:44:13 - 1.3501.2.474
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+- jbj: ltc: fix: retrofit a #define for LTC_LTC_PKCS_1_V1_5 enum
detection.
- jbj: neon: fix: permit --with-ssl=gnutls.
- jbj: neon: upgrade to 0.30.1.
- jbj: mongoc: fix: permit building --without-openssl.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.134 -r2.472.2.135 configure.ac
--- rpm/configure.ac 15 Mar 2016 19:39:52 - 2.472.2.134
+++ rpm/configure.ac 17 Mar 2016 21:44:13 - 2.472.2.135
@@ -1910,6 +1910,9 @@
if test -d ${includedir}/tommath; then
CPPFLAGS="$CPPFLAGS -I${includedir}/tommath"
fi
+ AC_CHECK_DECL([LTC_PKCS_1_V1_5],
+[ AC_DEFINE(USE_LTC_LTC_PKCS_1_V1_5, 1, [Define for older
LibTomCrypt])
+ ], [])
LIBS="$LIBS -ltommath"
], [])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmltc.c
$ cvs diff -u -r1.2.4.13 -r1.2.4.14 rpmltc.c
--- rpm/rpmio/rpmltc.c9 Mar 2016 21:26:34 - 1.2.4.13
+++ rpm/rpmio/rpmltc.c17 Mar 2016 21:44:14 - 1.2.4.14
@@ -379,7 +379,7 @@
unsigned char sig[4096]; /* XXX big enuf */
unsigned long siglen = sizeof(sig);
unsigned int dlen; /* XXX DSA */
-#if defined(LTC_LTC_PKCS_1_V1_5)
+#if defined(USE_LTC_LTC_PKCS_1_V1_5)
int _padding = LTC_LTC_PKCS_1_V1_5; /* XXX RSA */
#else
int _padding = LTC_PKCS_1_V1_5; /* XXX RSA */
@@ -448,7 +448,7 @@
unsigned char sig[2048];
unsigned long siglen = sizeof(sig);
unsigned int dlen; /* XXX DSA */
-#if defined(LTC_LTC_PKCS_1_V1_5)
+#if defined(USE_LTC_LTC_PKCS_1_V1_5)
int _padding = LTC_LTC_PKCS_1_V1_5; /* XXX RSA */
#else
int _padding = LTC_PKCS_1_V1_5; /* XXX RSA */
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm.spec.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 15-Mar-2016 20:39:53
Branch: rpm-5_4 Handle: 2016031519395200
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac rpm.spec.in
Log:
- snapshot: rpm-5.4.16-0.20160315.src.rpm.
- rpm.spec: rpmbuild can rebuild itself (+/- --with-versioned-paths).
- rpmdb: fix: disable DB_MULTIVERSION if non-root.
- distcheck: fix: clean up *.so after lua "make check".
Summary:
RevisionChanges Path
1.3501.2.471+3 -0 rpm/CHANGES
2.472.2.134 +1 -1 rpm/configure.ac
2.458.2.7 +20 -6 rpm/rpm.spec.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.470 -r1.3501.2.471 CHANGES
--- rpm/CHANGES 14 Mar 2016 06:28:16 - 1.3501.2.470
+++ rpm/CHANGES 15 Mar 2016 19:39:52 - 1.3501.2.471
@@ -1,4 +1,7 @@
5.4.15 -> 5.4.16:
+- jbj: rpm.spec: rpmbuild can rebuild itself (+/-
--with-versioned-paths).
+- jbj: rpmdb: fix: disable DB_MULTIVERSION if non-root.
+- jbj: distcheck: fix: clean up *.so after lua "make check".
- jbj: distcheck: throw lua-5.3.2 onto the "make check" pyre.
- jbj: lua: update to lua-5.3.2.
- jbj: autofu: make distcheck w/o cruft.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.133 -r2.472.2.134 configure.ac
--- rpm/configure.ac 12 Mar 2016 19:52:54 - 2.472.2.133
+++ rpm/configure.ac 15 Mar 2016 19:39:52 - 2.472.2.134
@@ -9,7 +9,7 @@
AC_PREREQ([2.63])
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
AC_INIT([rpm],[5.4.16],[PACKAGE_BUGREPORT_DEFAULT])
-PACKAGE_TIMESTAMP="2014-08-18" dnl # [-MM[-DD[ HH[:MM
+PACKAGE_TIMESTAMP="2016-03-15" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
AC_MSG_HEADER([INITIALIZATION])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.458.2.6 -r2.458.2.7 rpm.spec.in
--- rpm/rpm.spec.in 17 Aug 2014 20:15:58 - 2.458.2.6
+++ rpm/rpm.spec.in 15 Mar 2016 19:39:52 - 2.458.2.7
@@ -6,13 +6,20 @@
%define with_xz @WITH_XZ@%{nil}
%define with_apidocs@WITH_APIDOCS@%{nil}
-%{!?_usrlibrpm:%global _usrlibrpm @USRLIBRPM@}
-%{!?_rpmhome:%global _rpmhome @USRLIBRPM@}
-
%define __prefix%{?_prefix}%{!?_prefix:/usr}
+
+# XXX override existing rpmbuild configuration
+#%%{!?_usrlibrpm:%global _usrlibrpm @USRLIBRPM@}
+#%%{!?_rpmhome:%global _rpmhome @USRLIBRPM@}
+%global _usrlibrpm %{__prefix}/lib/rpm*
+%global _rpmhome %{__prefix}/lib/rpm*
+
%{?!_lib: %define _lib lib}
%{expand: %%define __share %(if [ -d %{__prefix}/share/man ]; then echo
/share ; else echo %%{nil} ; fi)}
+# XXX use helpers from just installed build root.
+%define find_lang %(echo %{buildroot}%{_rpmhome})/find-lang.sh
%{buildroot}
+%define __check_files %(echo %{buildroot}%{_rpmhome})/check-files
%{buildroot}
Summary: The RPM package management system.
Name: rpm
@@ -255,6 +262,8 @@
WITH_NEON="--with-neon --without-libproxy --with-expat"
%endif
+CFLAGS="${CFLAGS:- -O2}"; export CFLAGS
+
%ifarch x86_64
CFLAGS="$CFLAGS -DHAVE_VA_COPY -DVA_COPY=va_copy"; export CFLAGS
%endif
@@ -313,7 +322,7 @@
--with-build-extlibdep \
--with-build-maxextlibdep \
--without-valgrind \
---disable-openmp \
+--enable-openmp \
--enable-build-pic \
--enable-build-versionscript \
--enable-build-warnings \
@@ -351,12 +360,12 @@
Basenames Conflictname Dirnames Group Installtid Name Packages \
Providename Provideversion Requirename Requireversion Triggername \
Filemd5s Pubkeys Sha1header Sigmd5 \
- __db.001 __db.002 __db.003 __db.004 __db.005
+ __db.001 __db.002 __db.003 __db.004 __db.005 __db.006
do
touch $RPM_BUILD_ROOT/var/lib/rpm/$dbi
done
-( cd $RPM_BUILD_ROOT/%{_rpmhome}
+( cd ${RPM_BUILD_ROOT}/usr/lib/rpm*
tar xzf %{SOURCE1}
# XXX assume ix86 platforms for the moment
rm -rf ./alpha-linux
@@ -738,8 +747,13 @@
###%{_rpmhome}/lib/librpmjsm.a
###%{_rpmhome}/lib/librpmjsm.la
###%{_rpmhome}/lib/librpmjsm.so
+%{_
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ Makefile.am k...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 29-Sep-2014 20:26:49
Branch: rpm-5_4 Handle: 2014092918264404
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio Makefile.am keccak.c librpmio.vers md6.c md6.h
pcrs.c pcrs.h rpmlog.h rpmsq.c rpmsq.h rpmsql.c
Log:
- rpmsq: add _rpm_{insque,remque} functions.
Summary:
RevisionChanges Path
1.3501.2.450+1 -0 rpm/CHANGES
2.472.2.120 +7 -5 rpm/configure.ac
1.293.2.39 +11 -0 rpm/rpmio/Makefile.am
1.5.4.1 +6 -3 rpm/rpmio/keccak.c
2.199.2.46 +2 -0 rpm/rpmio/librpmio.vers
1.3.4.4 +4 -1 rpm/rpmio/md6.c
1.2.4.3 +6 -3 rpm/rpmio/md6.h
1.1.2.5 +2 -0 rpm/rpmio/pcrs.c
1.1.2.4 +2 -1 rpm/rpmio/pcrs.h
2.24.4.4+1 -0 rpm/rpmio/rpmlog.h
1.42.6.7+7 -4 rpm/rpmio/rpmsq.c
1.14.6.5+10 -0 rpm/rpmio/rpmsq.h
2.59.2.14 +3 -1 rpm/rpmio/rpmsql.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.449 -r1.3501.2.450 CHANGES
--- rpm/CHANGES 23 Sep 2014 18:58:55 - 1.3501.2.449
+++ rpm/CHANGES 29 Sep 2014 18:26:44 - 1.3501.2.450
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+- jbj: rpmsq: add _rpm_{insque,remque} functions.
- jbj: gcc: make peace with 4.8.2.
- jbj: sed: add sed(1) (at least s/foo/bar/) object and macro embedding.
- jbj: rpmpopt: fix: add an '@' lead-in --qf args that begin with '/'.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.119 -r2.472.2.120 configure.ac
--- rpm/configure.ac 28 Sep 2014 19:31:07 - 2.472.2.119
+++ rpm/configure.ac 29 Sep 2014 18:26:46 - 2.472.2.120
@@ -198,7 +198,6 @@
dnl # rpm_CFLAGS_ADD([-Wsequence-point],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wreturn-type],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wswitch],[RPM_CFLAGS])
- rpm_CFLAGS_ADD([-Wno-switch],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wswitch-default],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wswitch-enum],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wtrigraphs],[RPM_CFLAGS])
@@ -260,6 +259,7 @@
rpm_CFLAGS_ADD([-Wno-redundant-decls],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wnested-externs],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wunreachable-code],[RPM_CFLAGS])
+dnl # rpm_CFLAGS_ADD([-Wattributes],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Winline],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wlong-long],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wdisabled-optimization],[RPM_CFLAGS])
@@ -269,7 +269,7 @@
dnl # rpm_CFLAGS_ADD([-Wmissing-declarations],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wmissing-prototypes],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wold-style-definition],[RPM_CFLAGS])
-dnl #XXX rpmio/set.c
+dnl # XXX rpmio/set.c
dnl # if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
dnl # rpm_CFLAGS_ADD([-Wno-initializer-overrides], [RPM_CFLAGS])
dnl # fi
@@ -301,7 +301,6 @@
dnl # rpm_CFLAGS_ADD([-Wvla],[RPM_CFLAGS])
dnl # --- noisy and/or mostly useless
-dnl # rpm_CFLAGS_ADD([-Wattributes],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wbuiltin-macro-redefined],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wcoverage-mismatch],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wcpp],[RPM_CFLAGS])
@@ -330,6 +329,7 @@
dnl # rpm_CFLAGS_ADD([-fguess-branch-probability],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fif-conversion2],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fif-conversion],[RPM_CFLAGS])
+dnl # rpm_CFLAGS_ADD([-finline-functions-called-once],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fipa-pure-const],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fipa-profile],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fipa-reference],[RPM_CFLAGS])
@@ -418,6 +418,10 @@
rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fstack-protector-all],[RPM_CFLAGS])
+ if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then
+ rpm_CFLAGS_ADD([-fgnu-tm], [RPM_CFLAGS])
+ fi
+
dnl # --- options below are added to RPM_CFLAGS but _NOT_ added to CFLAGS
CFLAGS="$CFLAGS $RPM_CFLAGS"
dnl # --- configure --enable-build-pic
@@ -439,8 +443,6 @@
rpm_CFLAGS_ADD([-fsanitize=undefined], [RPM_CFLAGS])
rpm_CFLAGS_ADD([-fsanitize=undefi
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 23-Sep-2014 20:58:57 Branch: rpm-5_4 Handle: 2014092318585501 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac devtool.conf Log: - gcc: make peace with 4.8.2. Summary: RevisionChanges Path 1.3501.2.449+1 -0 rpm/CHANGES 2.472.2.117 +7 -3 rpm/configure.ac 2.365.2.100 +5 -3 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.448 -r1.3501.2.449 CHANGES --- rpm/CHANGES 21 Sep 2014 21:40:54 - 1.3501.2.448 +++ rpm/CHANGES 23 Sep 2014 18:58:55 - 1.3501.2.449 @@ -1,4 +1,5 @@ 5.4.15 -> 5.4.16: +- jbj: gcc: make peace with 4.8.2. - jbj: sed: add sed(1) (at least s/foo/bar/) object and macro embedding. - jbj: rpmpopt: fix: add an '@' lead-in --qf args that begin with '/'. - devzero2000: alias -P on --provides @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.116 -r2.472.2.117 configure.ac --- rpm/configure.ac 23 Sep 2014 08:53:37 - 2.472.2.116 +++ rpm/configure.ac 23 Sep 2014 18:58:56 - 2.472.2.117 @@ -255,7 +255,9 @@ dnl # rpm_CFLAGS_ADD([-Wmissing-prototypes],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wold-style-definition],[RPM_CFLAGS]) # XXX rpmio/set.c needs this + if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then rpm_CFLAGS_ADD([-Wno-override-init], [RPM_CFLAGS]) + fi dnl # rpm_CFLAGS_ADD([-Wpointer-to-int-cast],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wno-strict-prototypes],[RPM_CFLAGS]) @@ -273,7 +275,9 @@ dnl # rpm_CFLAGS_ADD([-Wsuggest-attribute=const],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wsuggest-attribute=noreturn],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wsuggest-attribute=pure],[RPM_CFLAGS]) + if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then rpm_CFLAGS_ADD([-Wno-unused-but-set-variable], [RPM_CFLAGS]) + fi dnl # rpm_CFLAGS_ADD([-Wdouble-promotion],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wvariadic-macros],[RPM_CFLAGS]) dnl # rpm_CFLAGS_ADD([-Wvla],[RPM_CFLAGS]) @@ -470,7 +474,7 @@ dnl # Add -fsanitize=memory (clang) AC_ARG_ENABLE(build-sanitize-memory, -AS_HELP_STRING([--enable-build-sanitize-memory], [build RPM instrumented for with MemoryChecker]), [dnl +AS_HELP_STRING([--enable-build-sanitize-memory], [build RPM instrumented for with MemorySanitizer]), [dnl if test ".$enableval" = .yes; then if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then rpm_CFLAGS_ADD([-fsanitize=memory -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer], [CFLAGS]) @@ -479,8 +483,8 @@ ]) dnl # Add -fsanitize=thread (clang) -AC_ARG_ENABLE(build-sanitize-address, -AS_HELP_STRING([--enable-build-sanitize-address], [build RPM instrumented for with AddressSanitizer]), [dnl +AC_ARG_ENABLE(build-sanitize-thread, +AS_HELP_STRING([--enable-build-sanitize-thread], [build RPM instrumented for with ThreadSanitizer]), [dnl if test ".$enableval" = .yes; then if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then rpm_CFLAGS_ADD([-fsanitize=thread], [CFLAGS]) @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.99 -r2.365.2.100 devtool.conf --- rpm/devtool.conf 17 Sep 2014 02:08:17 - 2.365.2.99 +++ rpm/devtool.conf 23 Sep 2014 18:58:56 - 2.365.2.100 @@ -727,8 +727,8 @@ export CC CXX=clang++ export CXX -#JAVA_HOME="/usr/java/jdk1.8.0_11" -JAVA_HOME="/usr/java/jdk1.7.0_03" +JAVA_HOME="/usr/java/jdk1.8.0_11" +#JAVA_HOME="/usr/java/jdk1.7.0_03" export JAVA_HOME %autogen %configure \ @@ -811,7 +811,9 @@ --enable-build-sanitize-address \ --enable-maintainer-mode -# --enable-build-sanitize-address +# --enable-build-gcov \ +# --enable-build-sanitize-address \ +# # Momonga 7 %momonga @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ rpmio.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 13-Sep-2014 19:50:52
Branch: rpm-5_4 Handle: 2014091317504902
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio rpmio.c
Log:
- rpmio: use funopen(3) on *BSD when available (untested).
Summary:
RevisionChanges Path
1.3501.2.439+1 -0 rpm/CHANGES
2.472.2.115 +12 -1 rpm/configure.ac
1.230.2.18 +25 -7 rpm/rpmio/rpmio.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.438 -r1.3501.2.439 CHANGES
--- rpm/CHANGES 11 Sep 2014 18:46:19 - 1.3501.2.438
+++ rpm/CHANGES 13 Sep 2014 17:50:49 - 1.3501.2.439
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+- jbj: rpmio: use funopen(3) on *BSD when available (untested).
- jbj: rpmct: add %{copy foo bar:} embedding.
- jbj: rpmpopt: fix: escaped newline was fubar, grr.
- jbj: lua: upgrade to lua-5.2.3.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.114 -r2.472.2.115 configure.ac
--- rpm/configure.ac 8 Sep 2014 20:55:51 - 2.472.2.114
+++ rpm/configure.ac 13 Sep 2014 17:50:50 - 2.472.2.115
@@ -224,6 +224,11 @@
if test ".$enableval" = .yes; then
if test ".`$CC --version 2>&1 | grep 'clang'`" != .; then
CFLAGS="$CFLAGS -fsanitize=address"
+#CFLAGS="$CFLAGS -fsanitize=thread"
+#CFLAGS="$CFLAGS -fsanitize=memory
-fsanitize-memory-track-origins=2 -fno-omit-frame-pointer"
+#CFLAGS="$CFLAGS -fsanitize=integer"
+#CFLAGS="$CFLAGS -fsanitize=undefined"
+#CFLAGS="$CFLAGS -fsanitize=undefined-trap"
fi
fi
])
@@ -741,7 +746,7 @@
sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl
machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl
sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl
-libio.h err.h mcheck.h limits.h libgen.h float.h dnl
+err.h mcheck.h limits.h libgen.h float.h dnl
glob.h poll.h netinet/in.h arpa/inet.h dnl
langinfo.h dnl
])
@@ -809,6 +814,12 @@
AC_CHECK_HEADERS(search.h)
AC_CHECK_FUNC(insque, [], [ AC_CHECK_LIB(compat, insque) ])
+dnl # POSIX fmemopen(3) et al API.
+AC_CHECK_FUNCS(fmemopen open_memstream open_wmemstream)
+AC_CHECK_HEADERS(libio.h)
+AC_CHECK_FUNCS(fopencookie)
+AC_CHECK_FUNCS(funopen)
+
dnl # POSIX pthreads API
WITH_PTHREADS=no
AC_ARG_WITH([pthreads],
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
$ cvs diff -u -r1.230.2.17 -r1.230.2.18 rpmio.c
--- rpm/rpmio/rpmio.c 11 Sep 2014 18:18:33 - 1.230.2.17
+++ rpm/rpmio/rpmio.c 13 Sep 2014 17:50:51 - 1.230.2.18
@@ -91,8 +91,12 @@
#include
#include
-#if defined(HAVE_LIBIO_H) && defined(_G_IO_IO_FILE_VERSION)
+#if defined(HAVE_FOPENCOOKIE) && defined(HAVE_LIBIO_H) &&
defined(_G_IO_IO_FILE_VERSION)
#define _USE_LIBIO 1
+#elif defined(HAVE_FUNOPEN)
+#define _USE_LIBIO 1
+#else
+#define _USE_LIBIO 0
#endif
/* XXX HP-UX w/o -D_XOPEN_SOURCE needs */
@@ -162,11 +166,7 @@
/**
*/
/*@unchecked@*/
-#if _USE_LIBIO
-int noLibio = 0;
-#else
-int noLibio = 1;
-#endif
+int noLibio = _USE_LIBIO;
#define TIMEOUT_SECS 60
@@ -2720,7 +2720,7 @@
*f = flags;
}
-#if _USE_LIBIO
+#if defined(HAVE_FOPENCOOKIE)
#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
/* XXX retrofit glibc-2.1.x typedef on glibc-2.0.x systems */
typedef _IO_cookie_io_functions_t cookie_io_functions_t;
@@ -2815,6 +2815,7 @@
FILE * fp = NULL;
#if _USE_LIBIO
+#if defined(HAVE_FOPENCOOKIE)
{ cookie_io_functions_t ciof;
ciof.read = iof->read;
ciof.write = iof->write;
@@ -2823,6 +2824,23 @@
fp = fopencookie(fd, stdio, ciof);
DBGIO(fd, (stderr, "<-- fopencookie(%p,\"%s\",*%p) returns fp %p\n", fd,
stdio, iof, fp));
}
+#elif defined(HAVE_FUNOPEN)
+ { void * cookie = (void *) fd;
+ int(*readfn) (void *cookie, char *, int) =
+ (int (*) (void *, char *, int)) iof->read;
+ int(*writefn) (void *cookie, const char *, int) =
+
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 18-Aug-2014 20:30:57 Branch: rpm-5_4 Handle: 2014081818305600 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start rpm-5.4.15 development. Summary: RevisionChanges Path 1.3501.2.424+3 -0 rpm/CHANGES 2.472.2.113 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.423 -r1.3501.2.424 CHANGES --- rpm/CHANGES 16 Aug 2014 22:56:27 - 1.3501.2.423 +++ rpm/CHANGES 18 Aug 2014 18:30:56 - 1.3501.2.424 @@ -1,3 +1,6 @@ +5.4.15 -> 5.4.16: +- jbj: start rpm-5.4.15 development. + 5.4.14 -> 5.4.15: - jbj: perl: add -rpath /path/to/libperl.so. - jbj: java: add -rpath /path/to/libjvm.so. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.112 -r2.472.2.113 configure.ac --- rpm/configure.ac 17 Aug 2014 16:49:18 - 2.472.2.112 +++ rpm/configure.ac 18 Aug 2014 18:30:56 - 2.472.2.113 @@ -8,8 +8,8 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.15],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2014-08-13" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.16],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2014-08-18" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf rpm/macros/...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 09-Aug-2014 00:40:42 Branch: rpm-5_4 Handle: 2014080822403803 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac devtool.conf rpm/macros macros.in rpm/rpmio macro.c rpmjni.cc Log: - java: bsh-2.0b5.jar in a oracle jdk1.8.0_11 JVM using JNI embedding. - java: add %_jvm_options to configure the JVM. - java: AutoFu attempt #2: construct $JVM_LDPATH from $JAVA_HOME. Summary: RevisionChanges Path 1.3501.2.422+3 -0 rpm/CHANGES 2.472.2.103 +3 -3 rpm/configure.ac 2.365.2.88 +10 -1 rpm/devtool.conf 1.39.2.39 +33 -16 rpm/macros/macros.in 2.249.2.14 +16 -14 rpm/rpmio/macro.c 1.1.2.4 +35 -20 rpm/rpmio/rpmjni.cc patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.421 -r1.3501.2.422 CHANGES --- rpm/CHANGES 8 Aug 2014 03:06:38 - 1.3501.2.421 +++ rpm/CHANGES 8 Aug 2014 22:40:38 - 1.3501.2.422 @@ -1,4 +1,7 @@ 5.4.14 -> 5.4.15: +- jbj: java: bsh-2.0b5.jar in a oracle jdk1.8.0_11 JVM using JNI embedding. +- jbj: java: add %_jvm_options to configure the JVM. +- jbj: java: AutoFu attempt #2: construct $JVM_LDPATH from $JAVA_HOME. - jbj: java: bsh-2.0b5.jar in a linux java-1.7.0.65 JVM using JNI embedding. - jbj: java: AutoFu attempt #1: linux-only because of ldd usage. - jbj: java: bsh-2.0b4.jar in a linux java-1.6.0.0 JVM using JNI embedding. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.102 -r2.472.2.103 configure.ac --- rpm/configure.ac 8 Aug 2014 03:06:38 - 2.472.2.102 +++ rpm/configure.ac 8 Aug 2014 22:40:39 - 2.472.2.103 @@ -1793,9 +1793,7 @@ CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" done -dnl # JVM -JAVA_ABSPATH="`which $JAVA`" -JVM_LDPATH="`ldd $JAVA_ABSPATH | grep libjli.so | sed -e 's,^.*libjli.so => /,/,' -e 's,/jli/libjli.so .*,/server,'`" +dnl # JVM (needs JNI_INCLUDE_DIR set above and JVM_LDPATH from env) LIBSsave="$LIBS" LIBS="$LIBS -L$JVM_LDPATH" RPM_CHECK_LIB( @@ -1805,6 +1803,8 @@ [ AC_CHECK_CLASS(bsh.Interpreter) AC_DEFINE(WITH_JNIEMBED, 1, [Define to 1 if you want an embedded JVM]) + LDFLAGS="$LDFLAGS -L$JVM_LDPATH" + LIBS="$LIBSsave -ljvm" ], [ LIBS="$LIBSsave" ]) @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.87 -r2.365.2.88 devtool.conf --- rpm/devtool.conf 8 Aug 2014 03:06:39 - 2.365.2.87 +++ rpm/devtool.conf 8 Aug 2014 22:40:39 - 2.365.2.88 @@ -716,7 +716,16 @@ # RHEL6x # --enable-build-gcov #--with-libtpm=/usr/lib64:/usr/include/libtpm +# --with-jvm=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.65.x86_64/include:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.65.x86_64/jre/lib/amd64/server \ %plymouth +JAVA_HOME="/usr/java/jdk1.8.0_11" +export JAVA_HOME +JRE_HOME="$JAVA_HOME/jre" +export JRE_HOME +JVM_LDPATH="$JRE_HOME/lib/amd64/server" +export JVM_LDPATH +PATH="$JAVA_HOME/bin:$PATH" +export PATH %autogen %configure \ --verbose \ @@ -775,7 +784,7 @@ --with-perlembed=/usr/lib64/perl5/CORE/:/usr/lib64/perl5/CORE \ --with-ruby=/usr/lib64:/usr/lib64/ruby/1.8 \ --with-mruby \ - --with-jvm=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.65.x86_64/include:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.65.x86_64/jre/lib/amd64/server \ +--with-jvm=$JAVA_HOME/include:$JAVA_HOME/jre/lib/amd64/server/ \ --with-selinux \ --with-sepol \ --with-semanage \ @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in $ cvs diff -u -r1.39.2.38 -r1.39.2.39 macros.in --- rpm/macros/macros.in 5 May 2014 19:48:45 - 1.39.2.38 +++ rpm/macros/macros.in 8 Aug 2014 22:40:40 - 1.39.2.39 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.38 2014/05/05 19:48:45 jbj Exp $ +# $Id: macros.in,v 1.39.2.39 2014/08/08 22:40:40 jbj Exp $
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 26-Jul-2014 21:06:19
Branch: rpm-5_4 Handle: 2014072619061205
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
- upgrade to db-6.1.19.
Summary:
RevisionChanges Path
1.3501.2.412+1 -0 rpm/CHANGES
2.472.2.99 +4 -5 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.411 -r1.3501.2.412 CHANGES
--- rpm/CHANGES 26 Jul 2014 19:04:12 - 1.3501.2.411
+++ rpm/CHANGES 26 Jul 2014 19:06:12 - 1.3501.2.412
@@ -1,4 +1,5 @@
5.4.14 -> 5.4.15:
+- jbj: upgrade to db-6.1.19.
- jbj: rpmrepo: fix: headerSprintf() memory leak.
- jbj: rpmrepo: don't use rpmdb keyring if %_dbpath isn't specified.
- jbj: rpmrepo: cleanup memory pools on exit.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.98 -r2.472.2.99 configure.ac
--- rpm/configure.ac 3 May 2014 06:14:48 - 2.472.2.98
+++ rpm/configure.ac 26 Jul 2014 19:06:17 - 2.472.2.99
@@ -544,7 +544,7 @@
MYPATH=$PATH
fi
-DBXY=db60
+DBXY=db61
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
@@ -1625,7 +1625,7 @@
CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
-[db-6.0], [db_create], [db.h],
+[db-6.1], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
@@ -1648,11 +1648,10 @@
[ DBLIBSRCS="$DBLIBSRCS sqlite.c" ],
[])
-dnl # Sqlite 3.7.0.1 from db-5.1.19
-dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
+dnl # Sqlite 3.8.3.1 from db-6.1.19
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
-[db_sql-6.0], [sqlite3_open], [dbsql.h],
+[db_sql-6.1], [sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 03-May-2014 06:53:36 Branch: rpm-5_4 Handle: 2014050304533500 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - autoFu: fix: chk libcrypto, not libopenssl, for symbol (Mark Hatle). Summary: RevisionChanges Path 1.3501.2.374+1 -0 rpm/CHANGES 2.472.2.97 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.373 -r1.3501.2.374 CHANGES --- rpm/CHANGES 25 Apr 2014 20:19:32 - 1.3501.2.373 +++ rpm/CHANGES 3 May 2014 04:53:35 - 1.3501.2.374 @@ -1,4 +1,5 @@ 5.4.14 -> 5.4.15: +- jbj: autoFu: fix: chk libcrypto, not libopenssl, for symbol (Mark Hatle). - jbj: pgp: rework DSA/SHA1 in order to support DSA2 signatures. - jbj: nss: detect/use NSS_Initialize/NSS_InitContext. - jbj: bc: add non-repudiable RSA signatures. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.96 -r2.472.2.97 configure.ac --- rpm/configure.ac 25 Apr 2014 19:57:41 - 2.472.2.96 +++ rpm/configure.ac 3 May 2014 04:53:35 - 2.472.2.97 @@ -1434,10 +1434,10 @@ [crypto], [ERR_load_CRYPTO_strings], [openssl/crypto.h], [no,external:none], [], [ AC_DEFINE(WITH_SSL, 1, [Define if building with OpenSSL]) - AC_CHECK_LIB([openssl], [RSA_generate_key_ex], [ + AC_CHECK_LIB([crypto], [RSA_generate_key_ex], [ AC_DEFINE(HAVE_RSA_GENERATE_KEY_EX, 1, [Define to 1 if you have the RSA_generate_key_ex() function.]) ]) - AC_CHECK_LIB([openssl], [DSA_generate_parameters_ex], [ + AC_CHECK_LIB([crypto], [DSA_generate_parameters_ex], [ AC_DEFINE(HAVE_DSA_GENERATE_PARAMETERS_EX, 1, [Define to 1 if you have the DSA_generate_parameters_ex() function.]) ]) ], []) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 25-Apr-2014 21:57:41 Branch: rpm-5_4 Handle: 2014042519574001 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - nss: detect/use NSS_Initialize/NSS_InitContext. Summary: RevisionChanges Path 1.3501.2.372+1 -0 rpm/CHANGES 2.472.2.96 +6 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.371 -r1.3501.2.372 CHANGES --- rpm/CHANGES 25 Apr 2014 02:43:38 - 1.3501.2.371 +++ rpm/CHANGES 25 Apr 2014 19:57:40 - 1.3501.2.372 @@ -1,4 +1,5 @@ 5.4.14 -> 5.4.15: +- jbj: nss: detect/use NSS_Initialize/NSS_InitContext. - jbj: bc: add non-repudiable RSA signatures. - jbj: ltc: add non-repudiable RSA signatures, haul out the trash. - jbj: nss: add non-repudiable RSA signatures, haul out the trash.. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.95 -r2.472.2.96 configure.ac --- rpm/configure.ac 24 Oct 2013 15:34:17 - 2.472.2.95 +++ rpm/configure.ac 25 Apr 2014 19:57:41 - 2.472.2.96 @@ -1420,6 +1420,12 @@ [nss3 nss], [NSS_NoDB_Init], [nss.h], [no,external:none], [], [ AC_DEFINE(WITH_NSS, 1, [Define if building with Mozilla NSS]) + AC_CHECK_LIB([nss3], [NSS_Initialize], [ + AC_DEFINE(HAVE_NSS_INITIALIZE, 1, [Define to 1 if you have the NSS_Initialize() function.]) + ]) + AC_CHECK_LIB([nss3], [NSS_InitContext], [ + AC_DEFINE(HAVE_NSS_INITCONTEXT, 1, [Define to 1 if you have the NSS_InitContext() function.]) + ]) ], []) dnl # OpenSSL @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 24-Oct-2013 17:34:18 Branch: rpm-5_4 Handle: 2013102415341700 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: start of 5.4.15 development Submitted by: mdawkins Summary: RevisionChanges Path 1.3501.2.353+3 -0 rpm/CHANGES 2.472.2.95 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.352 -r1.3501.2.353 CHANGES --- rpm/CHANGES 23 Oct 2013 18:43:19 - 1.3501.2.352 +++ rpm/CHANGES 24 Oct 2013 15:34:17 - 1.3501.2.353 @@ -1,3 +1,6 @@ +5.4.14 -> 5.4.15: +- mdawkins: start rpm-5.4.15 development. + 5.4.13 -> 5.4.14: - mooney: use __sun instead of __sun__ in #define (lp#1243472). - mooney: rpmconstant: ensure linkage w Oracle Studio 12.3 (lp#1243469). @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.94 -r2.472.2.95 configure.ac --- rpm/configure.ac 17 Oct 2013 19:34:00 - 2.472.2.94 +++ rpm/configure.ac 24 Oct 2013 15:34:17 - 2.472.2.95 @@ -8,8 +8,8 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.14],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2013-08-19" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.15],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2013-10-24" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 17-Oct-2013 21:34:01 Branch: rpm-5_4 Handle: 201310171934 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - mooney: solaris needs additional eval configuring NCPUS (lp#1240717). Summary: RevisionChanges Path 1.3501.2.349+1 -0 rpm/CHANGES 2.472.2.94 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.348 -r1.3501.2.349 CHANGES --- rpm/CHANGES 17 Oct 2013 19:10:38 - 1.3501.2.348 +++ rpm/CHANGES 17 Oct 2013 19:34:00 - 1.3501.2.349 @@ -1,4 +1,5 @@ 5.4.13 -> 5.4.14: +- mooney: solaris needs additional eval configuring NCPUS (lp#1240717). - jbj: i18n: update PO files (Translation Project). - jbj: c++: add minimal necessary hackery to compile/use rpmqv.cc. todo++. - mooney: fix: ensure endian definitions on endian.h challenged platforms. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.93 -r2.472.2.94 configure.ac --- rpm/configure.ac 17 Oct 2013 19:24:31 - 2.472.2.93 +++ rpm/configure.ac 17 Oct 2013 19:34:00 - 2.472.2.94 @@ -2211,7 +2211,7 @@ *-*-solaris* ) NCPUS_COMMAND="psrinfo | egrep 'on-line' | wc -l | sed -e 's+^ *++'" ;; *-*-darwin* ) NCPUS_COMMAND="/usr/sbin/sysctl -n hw.ncpu" ;; esac -NCPUS_RESULT=`$NCPUS_COMMAND` +NCPUS_RESULT=`eval $NCPUS_COMMAND` AC_MSG_RESULT([`$NCPUS_COMMAND` ($NCPUS_RESULT)]) AC_SUBST(NCPUS_COMMAND) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac system.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 30-Aug-2013 21:51:45 Branch: rpm-5_4 Handle: 2013083019514401 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac system.h Log: - mooney: fix: ensure endian definitions on endian.h challenged platforms. Summary: RevisionChanges Path 1.3501.2.345+1 -0 rpm/CHANGES 2.472.2.90 +2 -1 rpm/configure.ac 2.129.2.9 +17 -0 rpm/system.h patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.344 -r1.3501.2.345 CHANGES --- rpm/CHANGES 30 Aug 2013 14:34:41 - 1.3501.2.344 +++ rpm/CHANGES 30 Aug 2013 19:51:44 - 1.3501.2.345 @@ -1,4 +1,5 @@ 5.4.13 -> 5.4.14: +- mooney: fix: ensure endian definitions on endian.h challenged platforms. - devzero2000: fix opensolaris clash in build #lp 1218663 - jbj: neon: add NEON_LIBS to pick up _GSS_C_NT_HOSTBASED_SERVICE using --with-neon=internal on Mac OS X Lion. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.89 -r2.472.2.90 configure.ac --- rpm/configure.ac 26 Aug 2013 21:42:01 - 2.472.2.89 +++ rpm/configure.ac 30 Aug 2013 19:51:45 - 2.472.2.90 @@ -722,7 +722,8 @@ dnl # standard headers (generic) AC_CHECK_HEADERS([dnl fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl -signal.h stdbool.h sys/endian.h sys/ipc.h sys/socket.h sys/select.h dnl +signal.h stdbool.h sys/byteorder.h sys/endian.h dnl +sys/ipc.h sys/socket.h sys/select.h dnl sys/time.h sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl @@ . patch -p0 <<'@@ .' Index: rpm/system.h $ cvs diff -u -r2.129.2.8 -r2.129.2.9 system.h --- rpm/system.h 9 Aug 2013 10:30:22 - 2.129.2.8 +++ rpm/system.h 30 Aug 2013 19:51:45 - 2.129.2.9 @@ -11,6 +11,23 @@ #include +#if defined(HAVE_SYS_BYTEORDER_H) && !defined(BYTE_ORDER) +/* construct Linux & BSD-compatible defines for Solaris and other + * SVR4 systems that have sys/byteorder.h + */ +# define __LITTLE_ENDIAN 1234 +# define __BIG_ENDIAN4321 +/* synonyms used in some places */ +# define LITTLE_ENDIAN __LITTLE_ENDIAN +# define BIG_ENDIAN__BIG_ENDIAN +# include +# ifdef _LITTLE_ENDIAN +# define BYTE_ORDER __LITTLE_ENDIAN +# elif _BIG_ENDIAN +# define BYTE_ORDER __BIG_ENDIAN +# endif +#endif + #if defined(__LCLINT__) /*@-redef@*/ typedef unsigned int u_int32_t; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 19-Aug-2013 19:50:02 Branch: rpm-5_4 Handle: 2013081917500100 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start rpm-5.4.14 development. Summary: RevisionChanges Path 1.3501.2.342+3 -0 rpm/CHANGES 2.472.2.88 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.341 -r1.3501.2.342 CHANGES --- rpm/CHANGES 18 Aug 2013 19:37:56 - 1.3501.2.341 +++ rpm/CHANGES 19 Aug 2013 17:50:01 - 1.3501.2.342 @@ -1,3 +1,6 @@ +5.4.13 -> 5.4.14: +- jbj: start rpm-5.4.14 development. + 5.4.12 -> 5.4.13: - jbj: i18n: update PO files (Translation Project). - devzero2000: use in configure.ac /etc/os-release for vendor determination also @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.87 -r2.472.2.88 configure.ac --- rpm/configure.ac 15 Aug 2013 10:59:09 - 2.472.2.87 +++ rpm/configure.ac 19 Aug 2013 17:50:01 - 2.472.2.88 @@ -8,8 +8,8 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.13],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2013-07-25" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.14],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2013-08-19" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: 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: 15-Aug-2013 12:59:10 Branch: rpm-5_4 Handle: 2013081510590900 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: use in configure.ac /etc/os-release for vendor determination also /etc/os-release is a new upcoming attempt of a standard which is meant to supersede /etc/debian_version, and their counterparts in Fedora/SUSE/other: http://www.freedesktop.org/software/systemd/man/os-release.html /etc/lsb_release is similar to this, but not standardized. The standard interface right now is to call lsb_release which is a Python script and thus it have a very high overhead compared to merely reading a file. Summary: RevisionChanges Path 1.3501.2.340+6 -0 rpm/CHANGES 2.472.2.87 +1 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.339 -r1.3501.2.340 CHANGES --- rpm/CHANGES 15 Aug 2013 09:50:58 - 1.3501.2.339 +++ rpm/CHANGES 15 Aug 2013 10:59:09 - 1.3501.2.340 @@ -1,4 +1,10 @@ 5.4.12 -> 5.4.13: +- devzero2000: use in configure.ac /etc/os-release for vendor determination also + /etc/os-release is a new upcoming attempt of a standard which is meant to supersede + /etc/debian_version, and their counterparts in Fedora/SUSE/other: http://www.freedesktop.org/software/systemd/man/os-release.html + /etc/lsb_release is similar to this, but not standardized. The standard interface + right now is to call lsb_release which is a Python script and thus a very high + overhead compared to merely reading a file. - devzero2000: merge commit e4191162e1208b511ee8b4cbf258a77b2d00f4ee from @rpm.org: Search for 7za and 7z for 7-zip. - devzero2000: debugedit.c: fix #rhbz725378 @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.86 -r2.472.2.87 configure.ac --- rpm/configure.ac 15 Aug 2013 09:50:58 - 2.472.2.86 +++ rpm/configure.ac 15 Aug 2013 10:59:09 - 2.472.2.87 @@ -2174,6 +2174,7 @@ test -f /usr/bin/crux &&RPMCANONVENDOR=crux test -f /etc/ark-release && RPMCANONVENDOR=ark test -f /etc/openmamba-release && RPMCANONVENDOR=openmamba + test -r /etc/os-release &&. /etc/os-release && [ -n "$ID" ] && RPMCANONVENDOR="$ID" ;; esac RPMCANONOS="$target_os_noversion" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: 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: 15-Aug-2013 11:50:59
Branch: rpm-5_4 Handle: 2013081509505800
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
merge commit e4191162e1208b511ee8b4cbf258a77b2d00f4ee
from @rpm.org: Search for 7za and 7z for 7-zip.
Summary:
RevisionChanges Path
1.3501.2.339+2 -0 rpm/CHANGES
2.472.2.86 +1 -1 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.338 -r1.3501.2.339 CHANGES
--- rpm/CHANGES 8 Aug 2013 16:39:04 - 1.3501.2.338
+++ rpm/CHANGES 15 Aug 2013 09:50:58 - 1.3501.2.339
@@ -1,4 +1,6 @@
5.4.12 -> 5.4.13:
+- devzero2000: merge commit e4191162e1208b511ee8b4cbf258a77b2d00f4ee
+ from @rpm.org: Search for 7za and 7z for 7-zip.
- devzero2000: debugedit.c: fix #rhbz725378
Fixed in @rpm.org with commit id 1684b696.
Here we make something different: we give a warn if we meet
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.85 -r2.472.2.86 configure.ac
--- rpm/configure.ac 25 Jul 2013 21:58:34 - 2.472.2.85
+++ rpm/configure.ac 15 Aug 2013 09:50:58 - 2.472.2.86
@@ -592,7 +592,7 @@
AC_PATH_PROG(__LSATTR, lsattr, %{_bindir}/lsattr, $MYPATH)
AC_PATH_PROG(__LZMA, lzma, %{_bindir}/lzma, $MYPATH)
AC_PATH_PROG(__LZOP, lzop, %{_bindir}/lzop, $MYPATH)
-AC_PATH_PROG(__7ZIP, 7zip, /usr/bin/7za, $MYPATH)
+AC_PATH_PROGS(__7ZIP, [7zip 7za 7z], /usr/bin/7za, $MYPATH)
AC_PATH_PROG(__MAKE, make, %{_bindir}/make, $MYPATH)
AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
AC_PATH_PROG(__MONGO, mongo, %{_bindir}/mongo, $MYPATH)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 25-Jul-2013 23:58:35 Branch: rpm-5_4 Handle: 2013072521583400 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start rpm-5.4.13 development. Summary: RevisionChanges Path 1.3501.2.329+3 -0 rpm/CHANGES 2.472.2.85 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.328 -r1.3501.2.329 CHANGES --- rpm/CHANGES 18 Jul 2013 20:51:40 - 1.3501.2.328 +++ rpm/CHANGES 25 Jul 2013 21:58:34 - 1.3501.2.329 @@ -1,3 +1,6 @@ +5.4.12 -> 5.4.13: +- jbj: start rpm-5.4.13 development. + 5.4.11 -> 5.4.12: - jbj: i18n: update PO files (Translation Project). - jbj: lcov: uplift to 1.10. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.84 -r2.472.2.85 configure.ac --- rpm/configure.ac 19 Jul 2013 00:52:45 - 2.472.2.84 +++ rpm/configure.ac 25 Jul 2013 21:58:34 - 2.472.2.85 @@ -8,8 +8,8 @@ AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.12],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2012-07-06" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.13],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2013-07-25" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 08-Jul-2013 21:14:31
Branch: rpm-5_4 Handle: 2013070819143000
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
- rpmdb: uplift to db-6.0.19.
- start rpm-5.4.12 development.
Summary:
RevisionChanges Path
1.3501.2.323+4 -0 rpm/CHANGES
2.472.2.78 +4 -4 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.322 -r1.3501.2.323 CHANGES
--- rpm/CHANGES 8 Jul 2013 04:43:00 - 1.3501.2.322
+++ rpm/CHANGES 8 Jul 2013 19:14:30 - 1.3501.2.323
@@ -1,3 +1,7 @@
+5.4.11 -> 5.4.12:
+- jbj: rpmdb: uplift to db-6.0.19.
+- jbj: start rpm-5.4.12 development.
+
5.4.10 -> 5.4.11:
- jbj: default to "make V=0" silent builds to get rid of endless spewage.
- jbj: i18n: update PO files (Translation Project).
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.77 -r2.472.2.78 configure.ac
--- rpm/configure.ac 8 Jul 2013 04:43:00 - 2.472.2.77
+++ rpm/configure.ac 8 Jul 2013 19:14:30 - 2.472.2.78
@@ -8,7 +8,7 @@
AC_PREREQ([2.63])
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.4.11],[PACKAGE_BUGREPORT_DEFAULT])
+AC_INIT([rpm],[5.4.12],[PACKAGE_BUGREPORT_DEFAULT])
PACKAGE_TIMESTAMP="2012-07-06" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
@@ -544,7 +544,7 @@
MYPATH=$PATH
fi
-DBXY=db53
+DBXY=db60
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
@@ -1584,7 +1584,7 @@
CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
-[db-5.3], [db_create], [db.h],
+[db-6.0], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
@@ -1611,7 +1611,7 @@
dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
-[db_sql-5.3], [sqlite3_open], [dbsql.h],
+[db_sql-6.0], [sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf rpm/rpmio/ ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 05-Jul-2013 18:55:09
Branch: rpm-5_4 Handle: 2013070516550801
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac devtool.conf
rpm/rpmio rpmsquirrel.c
Log:
- squirrel: uplift to squirrel 3.0.4.
Summary:
RevisionChanges Path
1.3501.2.319+1 -0 rpm/CHANGES
2.472.2.76 +8 -3 rpm/configure.ac
2.365.2.71 +4 -4 rpm/devtool.conf
2.6.4.2 +22 -4 rpm/rpmio/rpmsquirrel.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.318 -r1.3501.2.319 CHANGES
--- rpm/CHANGES 2 Jul 2013 19:55:06 - 1.3501.2.318
+++ rpm/CHANGES 5 Jul 2013 16:55:08 - 1.3501.2.319
@@ -1,4 +1,5 @@
5.4.10 -> 5.4.11:
+- jbj: squirrel: uplift to squirrel 3.0.4.
- jbj: fix: rescusitate --with-uuid with pesky Mac OS X uuid_t typedef
- jbj: preliminaries for db-6.0.19 uplift.
- jbj: lua: fix: drop portability cruft to avoid lua panic..
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.75 -r2.472.2.76 configure.ac
--- rpm/configure.ac 4 Jul 2013 00:27:43 - 2.472.2.75
+++ rpm/configure.ac 5 Jul 2013 16:55:08 - 2.472.2.76
@@ -16,7 +16,7 @@
AC_CONFIG_SRCDIR([rpmqv.c])
AC_CONFIG_HEADERS([config.h])
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE([foreign tar-ustar])
+AM_INIT_AUTOMAKE([foreign tar-ustar subdir-objects])
AC_REQUIRE_AUX_FILE([install-sh])
AC_REQUIRE_AUX_FILE([mkinstalldirs])
AM_MAINTAINER_MODE
@@ -1722,13 +1722,18 @@
AC_SUBST(WITH_RUBY_VENDORARCHDIR)
-dnl # Squirrel
+dnl # Squirrel (needs -lstdc++)
+LIBSsave="$LIBS"
+LIBS="$LIBS -lstdc++"
RPM_CHECK_LIB(
[Squirrel], [squirrel],
[squirrel], [sq_open], [squirrel.h],
[no,external:none], [],
[
-], [])
+ LIBS="$LIBS -lsqstdlib"
+], [
+ LIBS="$LIBSsave"
+])
dnl # Tcl (should tcl8.4 be supported too?)
WITH_TCL_SUBDIR=""
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.70 -r2.365.2.71 devtool.conf
--- rpm/devtool.conf 4 Jul 2013 00:34:09 - 2.365.2.70
+++ rpm/devtool.conf 5 Jul 2013 16:55:08 - 2.365.2.71
@@ -316,17 +316,17 @@
--without-rc \
--without-js \
--without-gpsee \
---with-python=system \
+--with-python=2.7 \
--with-pythonembed=/usr/lib:/usr/include/python2.7 \
---without-perl \
+--with-perl \
+
--with-perlembed=/opt/local/lib/perl5/5.12.4/darwin-thread-multi-2level/CORE/ \
--without-perl-urpm \
---without-perlembed \
--with-ruby=/opt/local/lib/ruby/1.8 \
--without-selinux \
--without-sepol \
--without-semanage \
--without-libgit2 \
---without-squirrel \
+--with-squirrel \
--with-installed-readline \
--with-valgrind \
--enable-build-warnings \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsquirrel.c
$ cvs diff -u -r2.6.4.1 -r2.6.4.2 rpmsquirrel.c
--- rpm/rpmio/rpmsquirrel.c 15 Apr 2012 21:20:53 - 2.6.4.1
+++ rpm/rpmio/rpmsquirrel.c 5 Jul 2013 16:55:09 - 2.6.4.2
@@ -5,7 +5,14 @@
#ifdef WITH_SQUIRREL
#include
+#include
+#include
+#include
+#include
+#include
+#include
#endif
+
#define _RPMSQUIRREL_INTERNAL
#include "rpmsquirrel.h"
@@ -93,22 +100,32 @@
rpmsquirrelGetPool(_rpmsquirrelPool);
#if defined(WITH_SQUIRREL)
-static const char * _av[] = { "rpmsquirrel", NULL };
+static char * _av[] = { "rpmsquirrel", NULL };
SQInteger stacksize = 1024;
HSQUIRRELVM v = sq_open(stacksize);
int ac;
if (av == NULL) av = _av;
-ac = argvCount(av);
+ac = argvCount((ARGV_t)av);
squirrel->I = v;
sq_setforeignptr(v, squirrel);
-sq_setprintfunc(v, rpmsquirrelPrint);
+sq_setprintfunc(v, rpmsquirrelPrint, NULL);
+
+sq_pushroottable(v);
+
+sqstd_register_bloblib(v);
+sqstd_register_iolib(v);
+sqstd_register_systemlib(v);
+sqstd_reg
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 02-Jul-2013 21:55:07 Branch: rpm-5_4 Handle: 2013070219550600 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - fix: rescusitate --with-uuid with pesky Mac OS X uuid_t typedef Summary: RevisionChanges Path 1.3501.2.318+1 -0 rpm/CHANGES 2.472.2.74 +4 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.317 -r1.3501.2.318 CHANGES --- rpm/CHANGES 2 Jul 2013 02:22:22 - 1.3501.2.317 +++ rpm/CHANGES 2 Jul 2013 19:55:06 - 1.3501.2.318 @@ -1,4 +1,5 @@ 5.4.10 -> 5.4.11: +- jbj: fix: rescusitate --with-uuid with pesky Mac OS X uuid_t typedef - jbj: preliminaries for db-6.0.19 uplift. - jbj: lua: fix: drop portability cruft to avoid lua panic.. - jbj: blake: update to final NIST submission. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.73 -r2.472.2.74 configure.ac --- rpm/configure.ac 27 Jun 2013 12:40:11 - 2.472.2.73 +++ rpm/configure.ac 2 Jul 2013 19:55:06 - 2.472.2.74 @@ -1926,7 +1926,7 @@ esac RPM_CHECK_LIB( [OSSP uuid], [uuid], -[ossp-uuid uuid], [uuid_import], [uuid.h], +[uuid ossp-uuid], [uuid_import], [uuid.h], [no,external:none], [], [ dnl # enable OSSP uuid native API support for embedded Lua if test ".$WITH_LUA" = .yes; then @@ -1935,7 +1935,9 @@ ], []) case "$host" in *-*-darwin* ) -mv confdefs.h-SAVE confdefs.h;; +grep 'define HAVE_UNISTD_H' confdefs.h-SAVE >> confdefs.h +rm -f confdefs.h-SAVE +;; esac dnl # Syck @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: 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: 11-Sep-2012 18:09:15 Branch: rpm-5_4 Handle: 2012091116091400 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: /tmp/F Summary: RevisionChanges Path 1.3501.2.309+3 -0 rpm/CHANGES 2.472.2.72 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.308 -r1.3501.2.309 CHANGES --- rpm/CHANGES 26 Jul 2012 12:56:07 - 1.3501.2.308 +++ rpm/CHANGES 11 Sep 2012 16:09:14 - 1.3501.2.309 @@ -1,4 +1,7 @@ 5.4.10 -> 5.4.11: +- devzero2000: quote AC_PREREQ in configure.ac + for a old bug autoupdate don't do it before autoconf v2.66 + (http://lists.gnu.org/archive/html/autoconf-patches/2010-06/msg00014.html) - devzero2000: check secure_getenv for glibc 2.17 In glibc 2.17, __secure_getenv was renamed to secure_getenv. So check also for it. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.71 -r2.472.2.72 configure.ac --- rpm/configure.ac 26 Jul 2012 12:56:08 - 2.472.2.71 +++ rpm/configure.ac 11 Sep 2012 16:09:14 - 2.472.2.72 @@ -6,7 +6,7 @@ dnl ## REQUIREMENTS & INITIALIZATION dnl ## -AC_PREREQ(2.63) +AC_PREREQ([2.63]) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) AC_INIT([rpm],[5.4.10],[PACKAGE_BUGREPORT_DEFAULT]) PACKAGE_TIMESTAMP="2012-07-06" dnl # [-MM[-DD[ HH[:MM @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/misc/ mkdtemp.c 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: 26-Jul-2012 14:56:08
Branch: rpm-5_4 Handle: 2012072612560701
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac system.h
rpm/miscmkdtemp.c
Log:
check secure_getenv for glibc 2.17
In glibc 2.17, __secure_getenv was renamed to secure_getenv.
So check also for it.
Reference:
http://sourceware.org/glibc/wiki/Tips_and_Tricks/secure_getenv
http://marc.info/?t=13419261851&r=1&w=2
Summary:
RevisionChanges Path
1.3501.2.308+6 -0 rpm/CHANGES
2.472.2.71 +1 -1 rpm/configure.ac
1.1.8.1 +8 -4 rpm/misc/mkdtemp.c
2.129.2.5 +8 -2 rpm/system.h
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.307 -r1.3501.2.308 CHANGES
--- rpm/CHANGES 25 Jul 2012 18:10:38 - 1.3501.2.307
+++ rpm/CHANGES 26 Jul 2012 12:56:07 - 1.3501.2.308
@@ -1,4 +1,10 @@
5.4.10 -> 5.4.11:
+- devzero2000: check secure_getenv for glibc 2.17
+ In glibc 2.17, __secure_getenv was renamed to secure_getenv.
+ So check also for it.
+ Reference:
+ http://sourceware.org/glibc/wiki/Tips_and_Tricks/secure_getenv
+ http://marc.info/?t=13419261851&r=1&w=2
- mdawkins: applied mdv rpm-5.4.9-drop-dead-cputoolize-macro.patch
- mdawkins: applied mdv rpm-5.4.9-ditch-install-info-macros.patch
- jbj: git: rescusitate against current development tip.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.70 -r2.472.2.71 configure.ac
--- rpm/configure.ac 6 Jul 2012 16:31:56 - 2.472.2.70
+++ rpm/configure.ac 26 Jul 2012 12:56:08 - 2.472.2.71
@@ -907,7 +907,7 @@
ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo
dnl
getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl
lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl
-posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl
+posix_fadvise posix_fallocate putenv realpath regcomp secure_getenv
__secure_getenv dnl
setattrlist setenv setlocale setmode setxattr dnl
sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl
sigprocmask sigsuspend sigaction dnl
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/mkdtemp.c
$ cvs diff -u -r1.1 -r1.1.8.1 mkdtemp.c
--- rpm/misc/mkdtemp.c17 Mar 2009 16:30:16 - 1.1
+++ rpm/misc/mkdtemp.c26 Jul 2012 12:56:08 - 1.1.8.1
@@ -93,9 +93,13 @@
# define __xstat64(version, file, buf) stat (file, buf)
#endif
-#if ! (HAVE___SECURE_GETENV || _LIBC)
-# define __secure_getenv getenv
-#endif
+#if defined(HAVE_SECURE_GETENV)
+#define getenv(_s) secure_getenv(_s)
+#else
+#if defined(HAVE___SECURE_GETENV)
+#define getenv(_s) __secure_getenv(_s)
+#endif /* defined(HAVE_SECURE_GETENV) */
+#endif /* defined(HAVE___SECURE_GETENV) */
#ifdef _LIBC
# include
@@ -161,7 +165,7 @@
if (try_tmpdir)
{
- d = __secure_getenv ("TMPDIR");
+ d = getenv ("TMPDIR");
if (d != NULL && direxists (d))
dir = d;
else if (dir != NULL && direxists (dir))
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
$ cvs diff -u -r2.129.2.4 -r2.129.2.5 system.h
--- rpm/system.h 26 Apr 2012 17:46:49 - 2.129.2.4
+++ rpm/system.h 26 Jul 2012 12:56:08 - 2.129.2.5
@@ -169,9 +169,15 @@
#endif
#endif
-#if defined(HAVE___SECURE_GETENV) && !defined(__LCLINT__)
+#if !defined(__LCLINT__)
+#if defined(HAVE_SECURE_GETENV)
+#define getenv(_s) secure_getenv(_s)
+#else
+#if defined(HAVE___SECURE_GETENV)
#define getenv(_s) __secure_getenv(_s)
-#endif
+#endif /* defined(HAVE_SECURE_GETENV) */
+#endif /* defined(HAVE___SECURE_GETENV) */
+#endif /* !defined(__LCLINT__) */
#ifdef STDC_HEADERS
/*@-macrounrecog -incondefs -globuse -mustmod @*/ /* FIX: shrug */
@@ .
__
RPM Package Manager
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 06-Jul-2012 18:31:56 Branch: rpm-5_4 Handle: 2012070616315501 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: tagged 5.4.10 Summary: RevisionChanges Path 1.3501.2.304+1 -0 rpm/CHANGES 2.472.2.70 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.303 -r1.3501.2.304 CHANGES --- rpm/CHANGES 18 Jun 2012 18:10:38 - 1.3501.2.303 +++ rpm/CHANGES 6 Jul 2012 16:31:55 - 1.3501.2.304 @@ -1,4 +1,5 @@ 5.4.9 -> 5.4.10: +- mdawkins: tagged 5.4.10 - jbj: rpmns: reserve set(...) and dpkg(...) namespace syntax. - jbj: git: fix: stub-out git_strerror when --without-git. - devzero2000: fix common misspelling @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.69 -r2.472.2.70 configure.ac --- rpm/configure.ac 4 Jun 2012 15:10:02 - 2.472.2.69 +++ rpm/configure.ac 6 Jul 2012 16:31:56 - 2.472.2.70 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.9],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2012-04-02" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.10],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2012-07-06" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: 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: 04-May-2012 10:41:09
Branch: rpm-5_4 Handle: 2012050408410800
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
drop @rpm.org brp-python-hardlink
revert "add @rpm.org brp-python-hardlink in a more
portable way"
Summary:
RevisionChanges Path
1.3501.2.259+1 -0 rpm/CHANGES
2.472.2.66 +0 -10 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.258 -r1.3501.2.259 CHANGES
--- rpm/CHANGES 3 May 2012 20:01:04 - 1.3501.2.258
+++ rpm/CHANGES 4 May 2012 08:41:08 - 1.3501.2.259
@@ -1,4 +1,5 @@
5.4.8 -> 5.4.9:
+- devzero2000: drop @rpm.org brp-python-hardlink
- jbj: yocto: stub-in a de-featured approximation to desired build
options.
- jbj: autofu: fix: comment out brp-python-hardlink "stuff".
- jbj: autofu: make peace with automake-1.12.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.65 -r2.472.2.66 configure.ac
--- rpm/configure.ac 3 May 2012 19:59:17 - 2.472.2.65
+++ rpm/configure.ac 4 May 2012 08:41:08 - 2.472.2.66
@@ -620,16 +620,6 @@
AC_PATH_PROG(__OBJCOPY, objcopy, %{_bindir}/objcopy, $MYPATH)
AC_PATH_PROG(__OBJDUMP, objdump, %{_bindir}/objdump, $MYPATH)
AC_PATH_PROG(__STRIP, strip, %{_bindir}/strip, $MYPATH)
-dnl AC_CACHE_CHECK([for a suitable cryptohash command],
[ac_cv_path_CRYPTOHASH],
-dnl [AC_PATH_PROGS_FEATURE_CHECK([CRYPTOHASH], [sha512sum
sha384sum sha224sum sha256sum sha1sum md5sum cksum sum],
-dnl [[cryptohash_out=`echo 'RPM5' | $ac_path_CRYPTOHASH -b
2>/dev/null`
-dnl test "$?" = 0 \
-dnl && ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="-b" ac_path_CRYPTOHASH_found=:
-dnl test "$?" != 0 -a "$ac_path_CRYPTOHASH_found" != ":" \
-dnl && ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="" ac_path_CRYPTOHASH_found=:]],
-dnl [])], $MYPATH)
-dnl AC_SUBST([CRYPTOHASH], [$ac_cv_path_CRYPTOHASH])
-dnl AC_SUBST([CRYPTOHASH_OPTION], [$ac_cv_option_CRYPTOHASH])
AC_CHECK_PROGS(LIBTOOLIZE, libtoolize glibtoolize, libtoolize)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/scripts/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 03-May-2012 21:59:18
Branch: rpm-5_4 Handle: 2012050319591601
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/scripts Makefile.am
Log:
- autofu: fix: comment out brp-python-hardlink "stuff".
Summary:
RevisionChanges Path
1.3501.2.257+1 -0 rpm/CHANGES
2.472.2.65 +10 -10 rpm/configure.ac
1.75.2.19 +26 -24 rpm/scripts/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.256 -r1.3501.2.257 CHANGES
--- rpm/CHANGES 1 May 2012 16:18:11 - 1.3501.2.256
+++ rpm/CHANGES 3 May 2012 19:59:16 - 1.3501.2.257
@@ -1,4 +1,5 @@
5.4.8 -> 5.4.9:
+- jbj: autofu: fix: comment out brp-python-hardlink "stuff".
- jbj: autofu: make peace with automake-1.12.
- jbj: autofu: make peace with autoconf-2.69.
- jbj: l10n: stub-in a proof-of-concept sqlite3 database.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.64 -r2.472.2.65 configure.ac
--- rpm/configure.ac 1 May 2012 16:18:11 - 2.472.2.64
+++ rpm/configure.ac 3 May 2012 19:59:17 - 2.472.2.65
@@ -620,16 +620,16 @@
AC_PATH_PROG(__OBJCOPY, objcopy, %{_bindir}/objcopy, $MYPATH)
AC_PATH_PROG(__OBJDUMP, objdump, %{_bindir}/objdump, $MYPATH)
AC_PATH_PROG(__STRIP, strip, %{_bindir}/strip, $MYPATH)
-AC_CACHE_CHECK([for a suitable cryptohash command], [ac_cv_path_CRYPTOHASH],
-[AC_PATH_PROGS_FEATURE_CHECK([CRYPTOHASH], [sha512sum sha384sum
sha224sum sha256sum sha1sum md5sum cksum sum],
- [[cryptohash_out=`echo 'RPM5' | $ac_path_CRYPTOHASH -b
2>/dev/null`
-test "$?" = 0 \
-&& ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="-b" ac_path_CRYPTOHASH_found=:
-test "$?" != 0 -a "$ac_path_CRYPTOHASH_found" != ":" \
-&& ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="" ac_path_CRYPTOHASH_found=:]],
- [])], $MYPATH)
-AC_SUBST([CRYPTOHASH], [$ac_cv_path_CRYPTOHASH])
-AC_SUBST([CRYPTOHASH_OPTION], [$ac_cv_option_CRYPTOHASH])
+dnl AC_CACHE_CHECK([for a suitable cryptohash command],
[ac_cv_path_CRYPTOHASH],
+dnl [AC_PATH_PROGS_FEATURE_CHECK([CRYPTOHASH], [sha512sum
sha384sum sha224sum sha256sum sha1sum md5sum cksum sum],
+dnl [[cryptohash_out=`echo 'RPM5' | $ac_path_CRYPTOHASH -b
2>/dev/null`
+dnl test "$?" = 0 \
+dnl && ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="-b" ac_path_CRYPTOHASH_found=:
+dnl test "$?" != 0 -a "$ac_path_CRYPTOHASH_found" != ":" \
+dnl && ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="" ac_path_CRYPTOHASH_found=:]],
+dnl [])], $MYPATH)
+dnl AC_SUBST([CRYPTOHASH], [$ac_cv_path_CRYPTOHASH])
+dnl AC_SUBST([CRYPTOHASH_OPTION], [$ac_cv_option_CRYPTOHASH])
AC_CHECK_PROGS(LIBTOOLIZE, libtoolize glibtoolize, libtoolize)
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
$ cvs diff -u -r1.75.2.18 -r1.75.2.19 Makefile.am
--- rpm/scripts/Makefile.am 27 Apr 2012 20:39:22 - 1.75.2.18
+++ rpm/scripts/Makefile.am 3 May 2012 19:59:17 - 1.75.2.19
@@ -7,7 +7,7 @@
EXTRA_DIST = api-sanity-autotest.pl api-sanity-checker.pl \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
- brp-strip brp-python-hardlink.in brp-strip-comment-note
brp-nobuildrootpath \
+ brp-strip brp-strip-comment-note brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
brp-implant-ident-static brp-java-repack-jars \
check-files cross-build dbconvert.sh \
@@ -51,7 +51,7 @@
pkgdatadir = @USRLIBRPM@
pkgdata_SCRIPTS = \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
- brp-strip brp-python-hardlink brp-strip-comment-note
brp-nobuildrootpath \
+ brp-strip brp-strip-comment-note brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
check-files cross-build dbconvert.sh executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl fi
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/scripts/ 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: 23-Apr-2012 19:32:29
Branch: rpm-5_4 Handle: 2012042317322702
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/scripts Makefile.am
Log:
add @rpm.org brp-python-hardlink in a more
portable way
Check the best suitable cryptohash command
that the platform support instead of
hardwire sha1sum or other coreutils
Summary:
RevisionChanges Path
1.3501.2.246+2 -0 rpm/CHANGES
2.472.2.63 +11 -0 rpm/configure.ac
1.75.2.16 +25 -2 rpm/scripts/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.245 -r1.3501.2.246 CHANGES
--- rpm/CHANGES 23 Apr 2012 03:07:00 - 1.3501.2.245
+++ rpm/CHANGES 23 Apr 2012 17:32:27 - 1.3501.2.246
@@ -1,4 +1,6 @@
5.4.8 -> 5.4.9:
+- devzero2000: add @rpm.org brp-python-hardlink in a more
+ portable way
- mdawkins: doxygen-1.7.4 bug
- mdawkins: fontconfig dependencies
- mdawkins: haskell dependencies
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.62 -r2.472.2.63 configure.ac
--- rpm/configure.ac 18 Apr 2012 18:41:06 - 2.472.2.62
+++ rpm/configure.ac 23 Apr 2012 17:32:27 - 2.472.2.63
@@ -620,6 +620,17 @@
AC_PATH_PROG(__OBJCOPY, objcopy, %{_bindir}/objcopy, $MYPATH)
AC_PATH_PROG(__OBJDUMP, objdump, %{_bindir}/objdump, $MYPATH)
AC_PATH_PROG(__STRIP, strip, %{_bindir}/strip, $MYPATH)
+AC_CACHE_CHECK([for a suitable cryptohash command], [ac_cv_path_CRYPTOHASH],
+[AC_PATH_PROGS_FEATURE_CHECK([CRYPTOHASH], [sha512sum sha384sum
sha224sum sha256sum sha1sum md5sum cksum sum],
+ [[cryptohash_out=`echo 'RPM5' | $ac_path_CRYPTOHASH -b
2>/dev/null`
+test "$?" = 0 \
+&& ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="-b" ac_path_CRYPTOHASH_found=:
+test "$?" != 0 -a "$ac_path_CRYPTOHASH_found" != ":" \
+&& ac_cv_path_CRYPTOHASH="$ac_path_CRYPTOHASH"
ac_cv_option_CRYPTOHASH="" ac_path_CRYPTOHASH_found=:]],
+ [])], $MYPATH)
+AC_SUBST([CRYPTOHASH], [$ac_cv_path_CRYPTOHASH])
+AC_SUBST([CRYPTOHASH_OPTION], [$ac_cv_option_CRYPTOHASH])
+
AC_CHECK_PROGS(LIBTOOLIZE, libtoolize glibtoolize, libtoolize)
AC_SUBST(LIBTOOLIZE)
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
$ cvs diff -u -r1.75.2.15 -r1.75.2.16 Makefile.am
--- rpm/scripts/Makefile.am 10 Mar 2012 19:42:29 - 1.75.2.15
+++ rpm/scripts/Makefile.am 23 Apr 2012 17:32:29 - 1.75.2.16
@@ -7,7 +7,7 @@
EXTRA_DIST = api-sanity-autotest.pl \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
- brp-strip brp-strip-comment-note brp-nobuildrootpath \
+ brp-strip brp-python-hardlink.in brp-strip-comment-note
brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
brp-implant-ident-static brp-java-repack-jars \
check-files cross-build dbconvert.sh \
@@ -51,7 +51,7 @@
pkgdatadir = @USRLIBRPM@
pkgdata_SCRIPTS = \
brp-compress brp-python-bytecompile brp-java-gcjcompile \
- brp-strip brp-strip-comment-note brp-nobuildrootpath \
+ brp-strip brp-python-hardlink brp-strip-comment-note
brp-nobuildrootpath \
brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
check-files cross-build dbconvert.sh executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
@@ -69,6 +69,29 @@
tgpg u_pkg.sh \
vcheck vpkg-provides.sh vpkg-provides2.sh
+CLEANFILES = $(pkgdata_SCRIPTS)
+
+## brp-python-hardlink make rule
+## We don't use configure to do the substitution here; so we must do it
+## by hand. We use a funny notation here to avoid configure
+## substitutions in our text.
+do_subst = sed \
+ -e 's,[@]CRYPTOHASH[@],$(CRYPTOHASH),g' \
+ -e 's,[@]CRYPTOHASH_OPTION[@],$(CRYPTOHASH_OPTION),g' \
+ -e 's,[@]configure_input[@],Generated from $@.in; do not edit by hand.,g' \
+ -e 's,[@]__LN[@],$(__LN),g'
+
+## These files depend on Makefile so they are rebuilt if $(CRYPTOHASH),
+## $(__LN) or other do_subst'ituted varia
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ rpmfc.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 18-Apr-2012 19:20:22 Branch: rpm-5_4 Handle: 2012041817202101 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/lib rpmfc.c Log: - rpmfc: fix: OS X (and *BSD) are sighandler_t challenged. Summary: RevisionChanges Path 1.3501.2.240+1 -0 rpm/CHANGES 2.472.2.61 +3 -0 rpm/configure.ac 1.75.2.10 +5 -0 rpm/lib/rpmfc.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.239 -r1.3501.2.240 CHANGES --- rpm/CHANGES 14 Apr 2012 18:08:33 - 1.3501.2.239 +++ rpm/CHANGES 18 Apr 2012 17:20:21 - 1.3501.2.240 @@ -1,4 +1,5 @@ 5.4.8 -> 5.4.9: +- jbj: rpmfc: fix: OS X (and *BSD) are sighandler_t challenged. - jbj: fix: don't hash RPMTAG_FILERDEVS because of %dev usage. - jbj: change I18NSTRING -> STRING data type. - mdawkins: start rpm-5.4.9 development. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.60 -r2.472.2.61 configure.ac --- rpm/configure.ac 16 Apr 2012 03:21:21 - 2.472.2.60 +++ rpm/configure.ac 18 Apr 2012 17:20:21 - 2.472.2.61 @@ -892,6 +892,9 @@ AC_CHECK_SIZEOF(long long, 8) AC_CHECK_SIZEOF(unsigned long long, 8) +dnl linux/posix and *BSD signals differ still, sigh +AC_CHECK_TYPES([sighanlder_t, sig_t]) + dnl checks for library functions (specific) AC_FUNC_ALLOCA AC_FUNC_VPRINTF @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmfc.c $ cvs diff -u -r1.75.2.9 -r1.75.2.10 rpmfc.c --- rpm/lib/rpmfc.c 15 Apr 2012 21:20:57 - 1.75.2.9 +++ rpm/lib/rpmfc.c 18 Apr 2012 17:20:22 - 1.75.2.10 @@ -60,6 +60,11 @@ return 0; } +/* XXX FIXME: more AutoFu testing needed? */ +#if defined(HAVE_SIG_T) && !defined(SIGHANDLER_T) +typedef sig_t sighandler_t; +#endif + /** * Return output from helper script. * @todo Use poll(2) rather than select(2), if available. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmio/ Makefile.am r...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 10-Mar-2012 17:15:37
Branch: rpm-5_4 Handle: 2012031016153502
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio Makefile.am
rpm/tests Makefile.am
rpm/tools Makefile.am
Log:
- tests: enable additional tests.
Summary:
RevisionChanges Path
1.3501.2.225+1 -0 rpm/CHANGES
2.472.2.51 +5 -2 rpm/configure.ac
1.293.2.7 +7 -1 rpm/rpmio/Makefile.am
1.95.2.45 +35 -15 rpm/tests/Makefile.am
2.170.2.6 +3 -1 rpm/tools/Makefile.am
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.224 -r1.3501.2.225 CHANGES
--- rpm/CHANGES 7 Mar 2012 23:52:47 - 1.3501.2.224
+++ rpm/CHANGES 10 Mar 2012 16:15:35 - 1.3501.2.225
@@ -1,4 +1,5 @@
5.4.7 -> 5.4.8:
+- jbj: tests: enable additional tests.
- jbj: mongo: upgrade the tests from the mongo-c-driver. todo++.
- jbj: mongo: upgrade to latest mongo-c-driver.
- jbj: rpmjs: permit --with-gpsee=internal. todo++.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.50 -r2.472.2.51 configure.ac
--- rpm/configure.ac 5 Mar 2012 18:26:35 - 2.472.2.50
+++ rpm/configure.ac 10 Mar 2012 16:15:36 - 2.472.2.51
@@ -1391,7 +1391,7 @@
AM_CONDITIONAL([WITH_TPM], [true])
],[
AM_CONDITIONAL([WITH_TPM], [false])
- ])
+])
dnl # select default Cryptography implementation to use (default for CLI
option --usecrypto)
@@ -1491,10 +1491,13 @@
[git2], [git_repository_open], [git2.h],
[no,internal:external:none], [libgit2:include],
[ AC_DEFINE(WITH_LIBGIT2, 1, [Define if building with Libgit2])
+ AM_CONDITIONAL([WITH_LIBGIT2], [true])
if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
AC_DEFINE(HAVE_GIT2_H, 1, [Define to 1 if you have ])
fi
-], [])
+],[
+ AM_CONDITIONAL([WITH_LIBGIT2], [false])
+])
# APR
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.293.2.6 -r1.293.2.7 Makefile.am
--- rpm/rpmio/Makefile.am 4 Mar 2012 17:02:20 - 1.293.2.6
+++ rpm/rpmio/Makefile.am 10 Mar 2012 16:15:36 - 1.293.2.7
@@ -18,10 +18,16 @@
EXTRA_PROGRAMS = bsdiff bspatch rpmborg rpmcpio rpmcurl rpmdpkg \
rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \
rpmpbzip2 rpmpigz rpmtar rpmz \
- tasn tdir tfts tget tgit tglob thkp thtml tinv tkey tmacro tmagic \
+ tasn tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic \
tmire tperl tpython tput tpw trpmio tsexp tsvn tsw ttcl \
dumpasn1 lookup3
+noinst_PROGRAMS =
+if WITH_LIBGIT2
+noinst_PROGRAMS += tgit
+else
+EXTRA_PROGRAMS += tgit
+endif
if WITH_TPM
EXTRA_PROGRAMS += ttpm
endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
$ cvs diff -u -r1.95.2.44 -r1.95.2.45 Makefile.am
--- rpm/tests/Makefile.am 10 Mar 2012 13:05:51 - 1.95.2.44
+++ rpm/tests/Makefile.am 10 Mar 2012 16:15:37 - 1.95.2.45
@@ -890,30 +890,30 @@
@echo "=== $@ ==="
@${find} $(POPTURI) -type f -maxdepth 1 > tmp/find
@mkdir -p tmp/wget && ${wget} -i tmp/find -P tmp/wget > /dev/null 2>&1
- @mkdir -p tmp/cp && ${cp} -R $(POPTURI) tmp/cp
- @diff -ru tmp/{wget,cp}
+ -mkdir -p tmp/cp && ${cp} -R $(POPTURI) tmp/cp
+ -diff -ru tmp/{wget,cp}
@${grep} -i HREF $(POPTURI) > tmp/grep
check-sql:
@echo "=== $@ ==="
@echo "--> sqlite3:"
- @rm -f tmp/sqldb*
+ @rm -rf tmp/sqldb*
@-${sqlite3} -echo tmp/sqldb ".read ref/sqldb-basic.sql" >&
tmp/sqldb-basic.out
@-diff -u {tmp,ref}/sqldb-basic.out || cp {tmp,ref}/sqldb-basic.out
@echo "--> rpm STRING:"
- @rm -f tmp/sqldb*
+ @rm -rf tmp/sqldb*
@-${rpmsql} -echo tmp/sqldb ".read ref/sqldb-basic.sql" >&
tmp/sqldb-basic.out
@-diff -u {tmp,ref}/sqldb-basic.out
@echo "--> rpm STDIN:"
- @rm -f tmp/sqldb*
+ @rm -rf tmp/sqldb*
@-${rpmsql} -echo tmp/sqldb
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ macros.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Mar-2012 16:48:12 Branch: rpm-5_4 Handle: 2012030415481100 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/macros macros.in Log: - macros: add %__rmdir (and autofu detection) to the pile. Summary: RevisionChanges Path 1.3501.2.219+1 -0 rpm/CHANGES 2.472.2.45 +1 -0 rpm/configure.ac 1.39.2.23 +2 -1 rpm/macros/macros.in patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.218 -r1.3501.2.219 CHANGES --- rpm/CHANGES 3 Mar 2012 18:20:52 - 1.3501.2.218 +++ rpm/CHANGES 4 Mar 2012 15:48:11 - 1.3501.2.219 @@ -1,4 +1,5 @@ 5.4.7 -> 5.4.8: +- jbj: macros: add %__rmdir (and autofu detection) to the pile. - jbj: start rpm-5.4.8 development. 5.4.6 -> 5.4.7: @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.44 -r2.472.2.45 configure.ac --- rpm/configure.ac 3 Mar 2012 18:20:52 - 2.472.2.44 +++ rpm/configure.ac 4 Mar 2012 15:48:11 - 2.472.2.45 @@ -463,6 +463,7 @@ dnl # see if we have a mkdir(1) that supports option "-p". AC_PATH_PROGS(MKDIR, mkdir, mkdir) +AC_PATH_PROGS(RMDIR, rmdir, rmdir) AC_MSG_CHECKING([if $MKDIR supports -p]) rm -rf conftest __MKDIR_P="" @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in $ cvs diff -u -r1.39.2.22 -r1.39.2.23 macros.in --- rpm/macros/macros.in 1 Mar 2012 02:51:26 - 1.39.2.22 +++ rpm/macros/macros.in 4 Mar 2012 15:48:11 - 1.39.2.23 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.22 2012/03/01 02:51:26 jbj Exp $ +# $Id: macros.in,v 1.39.2.23 2012/03/04 15:48:11 jbj 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 @@ -113,6 +113,7 @@ %__pax @__PAX@ %__pgp @__PGP@ %__rm@__RM@ +%__rmdir @__RMDIR@ %__rsh @__RSH@ %__sed @__SED@ %__sh@__SH@ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 03-Mar-2012 19:20:53 Branch: rpm-5_4 Handle: 2012030318205200 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start rpm-5.4.8 development. Summary: RevisionChanges Path 1.3501.2.218+3 -0 rpm/CHANGES 2.472.2.44 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.217 -r1.3501.2.218 CHANGES --- rpm/CHANGES 1 Mar 2012 02:51:25 - 1.3501.2.217 +++ rpm/CHANGES 3 Mar 2012 18:20:52 - 1.3501.2.218 @@ -1,3 +1,6 @@ +5.4.7 -> 5.4.8: +- jbj: start rpm-5.4.8 development. + 5.4.6 -> 5.4.7: - jbj: OWL needs chatter/lsattr in chroot's. - devzero2000: include rpm.org fix for rhbz#782970 @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.43 -r2.472.2.44 configure.ac --- rpm/configure.ac 1 Mar 2012 02:51:25 - 2.472.2.43 +++ rpm/configure.ac 3 Mar 2012 18:20:52 - 2.472.2.44 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.7],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2012-03-01" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.8],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2012-03-02" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-Mar-2012 03:51:26
Branch: rpm-5_4 Handle: 2012030102512501
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/macros macros.in
Log:
- OWL needs chatter/lsattr in chroot's.
Summary:
RevisionChanges Path
1.3501.2.217+1 -0 rpm/CHANGES
2.472.2.43 +5 -3 rpm/configure.ac
1.39.2.22 +4 -2 rpm/macros/macros.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.216 -r1.3501.2.217 CHANGES
--- rpm/CHANGES 29 Feb 2012 13:32:12 - 1.3501.2.216
+++ rpm/CHANGES 1 Mar 2012 02:51:25 - 1.3501.2.217
@@ -1,4 +1,5 @@
5.4.6 -> 5.4.7:
+- jbj: OWL needs chatter/lsattr in chroot's.
- devzero2000: include rpm.org fix for rhbz#782970
don't process spec %include in false branch of %if clauses
- jbj: stub-in autofu for svn/git objects.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.42 -r2.472.2.43 configure.ac
--- rpm/configure.ac 29 Feb 2012 04:22:26 - 2.472.2.42
+++ rpm/configure.ac 1 Mar 2012 02:51:25 - 2.472.2.43
@@ -546,6 +546,7 @@
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
+AC_PATH_PROG(__CHATTR, chattr, %{_bindir}/chattr, $MYPATH)
AC_PATH_PROG(__CHGRP, chgrp, /bin/chgrp, $MYPATH)
AC_PATH_PROG(__CHMOD, chmod, /bin/chmod, $MYPATH)
AC_PATH_PROG(__CHOWN, chown, /bin/chown, $MYPATH)
@@ -563,10 +564,10 @@
AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog,
$MYPATH)
AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover,
$MYPATH)
AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate,
%{_bindir}/${DBXY}_replicate, $MYPATH)
-AC_PATH_PROG(__DBSQL, ${DBXY}_stat, %{_bindir}/${DBXY}sql, $MYPATH)
-AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_stat, %{_bindir}/${DBXY}_sql_codegen,
$MYPATH)
+AC_PATH_PROG(__DBSQL, ${DBXY}sql, %{_bindir}/${DBXY}sql, $MYPATH)
+AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_sql_codegen,
%{_bindir}/${DBXY}_sql_codegen, $MYPATH)
AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
-AC_PATH_PROG(__DB_TUNER, ${DBXY}_stat, %{_bindir}/${DBXY}_tuner, $MYPATH)
+AC_PATH_PROG(__DB_TUNER, ${DBXY}_tuner, %{_bindir}/${DBXY}_tuner, $MYPATH)
AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade,
$MYPATH)
AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
@@ -585,6 +586,7 @@
AC_PATH_PROG(__INSTALL_INFO, install-info, /sbin/install-info, $MYPATH)
AC_PATH_PROG(__LDCONFIG, ldconfig, /sbin/ldconfig, $MYPATH)
AC_PATH_PROG(__LN, ln, /bin/ln, $MYPATH)
+AC_PATH_PROG(__LSATTR, lsattr, %{_bindir}/lsattr, $MYPATH)
AC_PATH_PROG(__LZMA, lzma, %{_bindir}/lzma, $MYPATH)
AC_PATH_PROG(__LZOP, lzop, %{_bindir}/lzop, $MYPATH)
AC_PATH_PROG(__MAKE, make, %{_bindir}/make, $MYPATH)
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.39.2.21 -r1.39.2.22 macros.in
--- rpm/macros/macros.in 20 Feb 2012 19:25:07 - 1.39.2.21
+++ rpm/macros/macros.in 1 Mar 2012 02:51:26 - 1.39.2.22
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.21 2012/02/20 19:25:07 jbj Exp $
+# $Id: macros.in,v 1.39.2.22 2012/03/01 02:51:26 jbj 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
@@ -61,6 +61,7 @@
%__bash @__BASH@
%__bzip2 @__BZIP2@
%__cat @__CAT@
+%__chattr@__CHATTR@
%__chgrp @__CHGRP@
%__chmod @__CHMOD@
%__chown @__CHOWN@
@@ -97,8 +98,9 @@
%__ldconfig @__LDCONFIG@
%__ln@__LN@
%__ln_s @LN_S@
-%__lzip @__LZIP@
%__lrzip @__LRZIP@
+%__lsattr@__LSATTR@
+%__lzip @__LZIP@
%__lzma @__LZMA@
%__lzop
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf rpm/rpmio/ ...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 29-Feb-2012 05:22:27 Branch: rpm-5_4 Handle: 2012022904222601 Added files: (Branch: rpm-5_4) rpm/rpmio tgit.c tsvn.c Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac devtool.conf rpm/rpmio .cvsignore Makefile.am rpmgit.c rpmgit.h rpmsvn.c rpmsvn.h Log: - stub-in autofu for svn/git objects. Summary: RevisionChanges Path 1.3501.2.215+1 -0 rpm/CHANGES 2.472.2.42 +27 -1 rpm/configure.ac 2.365.2.25 +3 -0 rpm/devtool.conf 1.41.2.1+2 -0 rpm/rpmio/.cvsignore 1.293.2.5 +10 -4 rpm/rpmio/Makefile.am 2.1.2.1 +19 -0 rpm/rpmio/rpmgit.c 2.1.2.1 +48 -0 rpm/rpmio/rpmgit.h 2.1.2.1 +14 -1 rpm/rpmio/rpmsvn.c 2.1.2.1 +7 -1 rpm/rpmio/rpmsvn.h 1.1.2.1 +34 -0 rpm/rpmio/tgit.c 1.1.2.1 +31 -0 rpm/rpmio/tsvn.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.214 -r1.3501.2.215 CHANGES --- rpm/CHANGES 28 Feb 2012 21:45:58 - 1.3501.2.214 +++ rpm/CHANGES 29 Feb 2012 04:22:26 - 1.3501.2.215 @@ -1,4 +1,5 @@ 5.4.6 -> 5.4.7: +- jbj: stub-in autofu for svn/git objects. - jbj: ispras: upgrade to abi-sanity.checker.pl to 1.12.9. - jbj: macosx: permit (custom built) libtomcrypt in buildbot's. - jbj: devtool: stanza for Fedorable 16. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.41 -r2.472.2.42 configure.ac --- rpm/configure.ac 27 Feb 2012 01:19:51 - 2.472.2.41 +++ rpm/configure.ac 29 Feb 2012 04:22:26 - 2.472.2.42 @@ -1419,7 +1419,7 @@ dnl # Libsepol RPM_CHECK_LIB( [Libsepol], [sepol], -[sepol], [sepol], [sepol/sepol.h], +[sepol], [sepol_policydb_create], [sepol/sepol.h], [no,external:none], [], [ AC_DEFINE(WITH_SEPOL, 1, [Define if building with Libsepol]) ], []) @@ -1482,6 +1482,32 @@ fi ], [ AC_MSG_WARN([No Neon library found, using unsupported configuration]) ]) +# Libgit2 +RPM_CHECK_LIB( +[Libgit2], [libgit2], +[git2], [git_repository_open], [git2.h], +[no,external:none], [], +[ AC_DEFINE(WITH_LIBGIT2, 1, [Define if building with Libgit2]) +], []) + +# APR +RPM_CHECK_LIB( +[Apr], [apr], +[apr-1], [apr_initialize], [apr-1/apr.h], +[no,external:none], [], +[ AC_DEFINE(WITH_APR, 1, [Define if building with Apr]) + CPPFLAGS="$CPPFLAGS -I$prefix/include/apr-1" +], []) + +# Subversion +RPM_CHECK_LIB( +[Subversion], [subversion], +[svn_client-1], [svn_client_create_context], [subversion-1/svn_client.h], +[no,external:none], [], +[ AC_DEFINE(WITH_SUBVERSION, 1, [Define if building with Subversion]) + CPPFLAGS="$CPPFLAGS -I$prefix/include/subversion-1" +], []) + dnl # File (magic) WITH_FILE_INTERNAL=false RPM_CHECK_LIB( @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.24 -r2.365.2.25 devtool.conf --- rpm/devtool.conf 28 Feb 2012 22:18:01 - 2.365.2.24 +++ rpm/devtool.conf 29 Feb 2012 04:22:26 - 2.365.2.25 @@ -456,6 +456,9 @@ --with-selinux \ --with-sepol \ --with-semanage \ +--with-libgit2 \ +--with-apr \ +--with-subversion \ --without-squirrel \ --with-build-extlibdep \ --with-build-maxextlibdep \ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/.cvsignore $ cvs diff -u -r1.41 -r1.41.2.1 .cvsignore --- rpm/rpmio/.cvsignore 12 Aug 2010 13:39:55 - 1.41 +++ rpm/rpmio/.cvsignore 29 Feb 2012 04:22:27 - 1.41.2.1 @@ -38,6 +38,7 @@ tdir tfts tget +tgit tglob thkp tinv @@ -53,6 +54,7 @@ trpmio truby tsexp +tsvn tsw ttcl ttpm @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.293.2.4 -r1.293.2.5 Makefile.am --- rpm/rpmio/Makefile.am 15 Aug 2011 20:33:16 - 1.293.2.4
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 27-Feb-2012 02:19:52
Branch: rpm-5_4 Handle: 2012022701195100
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac devtool.conf
Log:
- macosx: permit (custom built) libtomcrypt in buildbot's.
Summary:
RevisionChanges Path
1.3501.2.213+1 -0 rpm/CHANGES
2.472.2.41 +2 -1 rpm/configure.ac
2.365.2.20 +2 -2 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.212 -r1.3501.2.213 CHANGES
--- rpm/CHANGES 23 Feb 2012 23:13:45 - 1.3501.2.212
+++ rpm/CHANGES 27 Feb 2012 01:19:51 - 1.3501.2.213
@@ -1,4 +1,5 @@
5.4.6 -> 5.4.7:
+- jbj: macosx: permit (custom built) libtomcrypt in buildbot's.
- jbj: devtool: stanza for Fedorable 16.
- jbj: autofu: fix: F16 can't find db.h because of ${includdir}
expansion.
- jbj: tests: revert RPMRC_NOSIG to keep the buildbot waterfall green.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.40 -r2.472.2.41 configure.ac
--- rpm/configure.ac 26 Feb 2012 23:26:40 - 2.472.2.40
+++ rpm/configure.ac 27 Feb 2012 01:19:51 - 2.472.2.41
@@ -1375,7 +1375,8 @@
[tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt_cfg.h],
[no,external:none], [],
[ AC_DEFINE(WITH_TOMCRYPT, 1, [Define if building with LibTomCrypt])
- CPPFLAGS="$CPPFLAGS -I${includedir}/tomcrypt -I${includedir}/tommath"
+ CPPFLAGS="$CPPFLAGS -DLTM_DESC -I${includedir}/tomcrypt
-I${includedir}/tommath"
+ LIBS="$LIBS -ltommath"
], [])
dnl # IBM TPM 1.2 software emulation
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.19 -r2.365.2.20 devtool.conf
--- rpm/devtool.conf 26 Feb 2012 00:23:57 - 2.365.2.19
+++ rpm/devtool.conf 27 Feb 2012 01:19:51 - 2.365.2.20
@@ -220,7 +220,7 @@
--with-gcrypt \
--without-tomcrypt \
--without-tpm \
---without-libtasn1 \
+--with-libtasn1 \
--without-pakchois \
--without-gnutls \
--with-neon=external \
@@ -283,7 +283,7 @@
--with-openssl \
--with-nss \
--with-gcrypt \
---without-tomcrypt \
+--with-tomcrypt \
--without-tpm \
--without-libtasn1 \
--without-pakchois \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 24-Feb-2012 00:10:01
Branch: rpm-5_4 Handle: 201202232311
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
- autofu: fix: F16 can't find db.h because of ${includdir} expansion.
Summary:
RevisionChanges Path
1.3501.2.211+1 -0 rpm/CHANGES
2.472.2.38 +2 -1 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.210 -r1.3501.2.211 CHANGES
--- rpm/CHANGES 22 Feb 2012 21:31:14 - 1.3501.2.210
+++ rpm/CHANGES 23 Feb 2012 23:10:00 - 1.3501.2.211
@@ -1,4 +1,5 @@
5.4.6 -> 5.4.7:
+- jbj: autofu: fix: F16 can't find db.h because of ${includdir}
expansion.
- jbj: tests: revert RPMRC_NOSIG to keep the buildbot waterfall green.
- jbj: tests: fix: use "keys.n3npq.net" as default keyserver.
- jbj: stub-out per-mode disabling of signature/digest using
%{_vsflags_foo}
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.37 -r2.472.2.38 configure.ac
--- rpm/configure.ac 21 Feb 2012 13:38:14 - 2.472.2.37
+++ rpm/configure.ac 23 Feb 2012 23:10:01 - 2.472.2.38
@@ -1497,7 +1497,8 @@
dnl # Berkeley-DB & SQLite
DBLIBSRCS=""
-CPPFLAGS="${CPPFLAGS} -I${includedir}/${DBXY}"
+# XXX won't handle --includedir override
+CPPFLAGS="${CPPFLAGS} -I${prefix}/include/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
[db-5.3], [db_create], [db.h],
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Feb-2012 14:38:14
Branch: rpm-5_4 Handle: 2012022113381301
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
- start rpm-5.4.7 development.
Summary:
RevisionChanges Path
1.3501.2.204+3 -0 rpm/CHANGES
2.472.2.37 +2 -2 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.203 -r1.3501.2.204 CHANGES
--- rpm/CHANGES 20 Feb 2012 19:25:06 - 1.3501.2.203
+++ rpm/CHANGES 21 Feb 2012 13:38:13 - 1.3501.2.204
@@ -1,3 +1,6 @@
+5.4.6 -> 5.4.7:
+- jbj: start rpm-5.4.7 development.
+
5.4.5 -> 5.4.6:
- jbj: remove %{load:...} shims for macro refactoring.
- jbj: distcheck: fix: libsql.la reverted (lp#936610).
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.36 -r2.472.2.37 configure.ac
--- rpm/configure.ac 20 Feb 2012 16:59:43 - 2.472.2.36
+++ rpm/configure.ac 21 Feb 2012 13:38:14 - 2.472.2.37
@@ -8,8 +8,8 @@
AC_PREREQ(2.63)
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.4.6],[PACKAGE_BUGREPORT_DEFAULT])
-PACKAGE_TIMESTAMP="2012-02-21" dnl # [-MM[-DD[ HH[:MM
+AC_INIT([rpm],[5.4.7],[PACKAGE_BUGREPORT_DEFAULT])
+PACKAGE_TIMESTAMP="2012-03-01" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
AC_MSG_HEADER([INITIALIZATION])
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 20-Feb-2012 17:59:44 Branch: rpm-5_4 Handle: 2012022016594300 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - micro++ -> 5.4.6 and add timestamp. Summary: RevisionChanges Path 1.3501.2.202+1 -0 rpm/CHANGES 2.472.2.36 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.201 -r1.3501.2.202 CHANGES --- rpm/CHANGES 20 Feb 2012 15:09:37 - 1.3501.2.201 +++ rpm/CHANGES 20 Feb 2012 16:59:43 - 1.3501.2.202 @@ -2,6 +2,7 @@ - jbj: distcheck: fix: libsql.la reverted (lp#936610). - jbj: ispras: fix: add missing modules (lp#911266). - jbj: python: fix: headerFini instead of headerFreeIterator (Per Oyvind). +- jbj: micro++ -> 5.4.6 and add timestamp. - jbj: start rpm-5.4.6 development. 5.4.4 -> 5.4.5: @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.35 -r2.472.2.36 configure.ac --- rpm/configure.ac 19 Feb 2012 17:02:11 - 2.472.2.35 +++ rpm/configure.ac 20 Feb 2012 16:59:43 - 2.472.2.36 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.5],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2012-02-19" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.6],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2012-02-21" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 19-Feb-2012 18:02:11 Branch: rpm-5_4 Handle: 2012021917021100 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - micro++ -> 5.4.5 and add timestamp. Summary: RevisionChanges Path 1.3501.2.198+1 -0 rpm/CHANGES 2.472.2.35 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.197 -r1.3501.2.198 CHANGES --- rpm/CHANGES 19 Feb 2012 16:59:18 - 1.3501.2.197 +++ rpm/CHANGES 19 Feb 2012 17:02:11 - 1.3501.2.198 @@ -1,4 +1,5 @@ 5.4.4 -> 5.4.5: +- jbj: micro++ -> 5.4.5 and add timestamp. - jbj: i18n: add eo.po (Translation Project). - jbj: i18n: update PO files (Translation Project). - jbj: hkp: revert to "keys.n3npq.net" for CI tests. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.34 -r2.472.2.35 configure.ac --- rpm/configure.ac 18 Feb 2012 22:27:20 - 2.472.2.34 +++ rpm/configure.ac 19 Feb 2012 17:02:11 - 2.472.2.35 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.4],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2011-10-01" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.5],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2012-02-19" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 15-Feb-2012 21:35:05
Branch: rpm-5_4 Handle: 2012021520350401
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/macros macros.in
Log:
- hkp: default to standard SKS pool for now, todo++.
- rpmdb: upgrade to db-5.3.15, todo++.
- start rpm-5.4.5 development.
Summary:
RevisionChanges Path
1.3501.2.190+5 -0 rpm/CHANGES
2.472.2.33 +3 -3 rpm/configure.ac
1.39.2.19 +3 -2 rpm/macros/macros.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.189 -r1.3501.2.190 CHANGES
--- rpm/CHANGES 1 Feb 2012 13:06:24 - 1.3501.2.189
+++ rpm/CHANGES 15 Feb 2012 20:35:04 - 1.3501.2.190
@@ -1,3 +1,8 @@
+5.4.4 -> 5.4.5:
+- jbj: hkp: default to standard SKS pool for now, todo++.
+- jbj: rpmdb: upgrade to db-5.3.15, todo++.
+- jbj: start rpm-5.4.5 development.
+
5.4.3 -> 5.4.4:
- devzero2000: call with safety some python API that
can segfault if called with a NULL pointer.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.32 -r2.472.2.33 configure.ac
--- rpm/configure.ac 1 Oct 2011 15:19:05 - 2.472.2.32
+++ rpm/configure.ac 15 Feb 2012 20:35:04 - 2.472.2.33
@@ -539,7 +539,7 @@
MYPATH=$PATH
fi
-DBXY=db52
+DBXY=db53
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
@@ -1499,7 +1499,7 @@
CPPFLAGS="${CPPFLAGS} -I${includedir}/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
-[db-5.2], [db_create], [db.h],
+[db-5.3], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
@@ -1526,7 +1526,7 @@
dnl XXX error: `db3' is already registered with AC_CONFIG_SUBDIRS.
RPM_CHECK_LIB(
[Berkeley-DB (+SQLite3)], [dbsql],
-[db_sql-5.2], [sqlite3_open], [dbsql.h],
+[db_sql-5.3], [sqlite3_open], [dbsql.h],
[yes,external], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.39.2.18 -r1.39.2.19 macros.in
--- rpm/macros/macros.in 13 Sep 2011 01:12:51 - 1.39.2.18
+++ rpm/macros/macros.in 15 Feb 2012 20:35:05 - 1.39.2.19
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.18 2011/09/13 01:12:51 jbj Exp $
+# $Id: macros.in,v 1.39.2.19 2012/02/15 20:35:05 jbj 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
@@ -529,7 +529,8 @@
# Horowitz Key Protocol server configuration
#
-%_hkp_keyserver hkp://keys.n3npq.net
+#%_hkp_keyserver hkp://keys.n3npq.net
+%_hkp_keyserver hkp://pool.sks-keyservers.net
%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 01-Oct-2011 17:19:06 Branch: rpm-5_4 Handle: 2011100115190401 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start rpm-5.4.4 development. Summary: RevisionChanges Path 1.3501.2.181+3 -0 rpm/CHANGES 2.472.2.32 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.180 -r1.3501.2.181 CHANGES --- rpm/CHANGES 1 Oct 2011 14:41:17 - 1.3501.2.180 +++ rpm/CHANGES 1 Oct 2011 15:19:04 - 1.3501.2.181 @@ -1,3 +1,6 @@ +5.4.3 -> 5.4.4: +- jbj: start rpm-5.4.4 development. + 5.4.2 -> 5.4.3: - jbj: release rpm-5.4.3. - jbj: rsa: avoid memory leak on quick-check error returns. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.31 -r2.472.2.32 configure.ac --- rpm/configure.ac 30 Sep 2011 20:19:37 - 2.472.2.31 +++ rpm/configure.ac 1 Oct 2011 15:19:05 - 2.472.2.32 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.3],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2011-09-05" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.4],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2011-10-01" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf rpm/rpmio/ ...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 30-Sep-2011 22:19:38 Branch: rpm-5_4 Handle: 2011093020193701 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac devtool.conf rpm/rpmio rpmjs.c rpm/tests/ref showrc Log: - gpsee: snapshot RPM+JS resurrection work-in-progress for release. Summary: RevisionChanges Path 1.3501.2.178+1 -0 rpm/CHANGES 2.472.2.31 +1 -1 rpm/configure.ac 2.365.2.15 +1 -1 rpm/devtool.conf 1.36.2.2+14 -0 rpm/rpmio/rpmjs.c 1.37.2.5+3 -1 rpm/tests/ref/showrc patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.177 -r1.3501.2.178 CHANGES --- rpm/CHANGES 30 Sep 2011 19:54:28 - 1.3501.2.177 +++ rpm/CHANGES 30 Sep 2011 20:19:37 - 1.3501.2.178 @@ -1,4 +1,5 @@ 5.4.2 -> 5.4.3: +- jbj: gpsee: snapshot RPM+JS resurrection work-in-progress for release. - jbj: leg: stub-in a fictional architecture to restructure the ARM namespace based on "attributes". - jbj: arm: add the next 6 armv7* permutations to demonstrate the futility @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.30 -r2.472.2.31 configure.ac --- rpm/configure.ac 13 Sep 2011 01:12:51 - 2.472.2.30 +++ rpm/configure.ac 30 Sep 2011 20:19:37 - 2.472.2.31 @@ -1713,7 +1713,7 @@ AC_DEFINE(HAVE_GPSEE_H, 1, [Define to 1 if you have ]) AC_DEFINE(HAVE_LIBGPSEE, 1, [Define to 1 if you have the 'gpsee' library (-ljs).]) else - GPSEE_MODULES_PATH="$withval/libexec" + GPSEE_MODULES_PATH="$prefix/libexec/gpsee" AC_SUBST(GPSEE_MODULES_PATH) fi ], []) @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.14 -r2.365.2.15 devtool.conf --- rpm/devtool.conf 13 Sep 2011 01:12:51 - 2.365.2.14 +++ rpm/devtool.conf 30 Sep 2011 20:19:37 - 2.365.2.15 @@ -446,7 +446,7 @@ --without-bash \ --without-rc \ --without-js \ ---without-gpsee \ +--with-gpsee \ --with-python \ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmjs.c $ cvs diff -u -r1.36.2.1 -r1.36.2.2 rpmjs.c --- rpm/rpmio/rpmjs.c 23 Sep 2011 21:11:12 - 1.36.2.1 +++ rpm/rpmio/rpmjs.c 30 Sep 2011 20:19:38 - 1.36.2.2 @@ -121,6 +121,11 @@ fprintf(stderr, "==> %s(%p) I %p\n", __FUNCTION__, js, js->I); #if defined(WITH_GPSEE) +#if defined(XXX_GPSEE_DEBUGGER) +gpsee_finiDebugger(js->jsdc); +js->jsdc = NULL; +#endif + (void) gpsee_destroyInterpreter(js->I); #endif js->I = NULL; @@ -169,6 +174,11 @@ JSI_t I = NULL; #if defined(WITH_GPSEE) + +#if defined(XXX_GPSEE_DEBUGGER) /* XXX js->jsdc? */ +JSDContext *jsdc; +#endif + if (flags == 0) flags = _rpmjs_options; @@ -179,6 +189,10 @@ /* XXX FIXME: js->Iargv/js->Ienviron for use by rpmjsRunFile() */ I = gpsee_createInterpreter(); +#if defined(XXX_GPSEE_DEBUGGER) +js->jsdc = gpsee_initDebugger(I->cx, I->realm, DEBUGGER_JS); +#endif + #ifdef NOTYET /* FIXME: dig out where NOCACHE has moved. */ if (F_ISSET(flags, NOCACHE)) I->useCompilerCache = 0; @@ . patch -p0 <<'@@ .' Index: rpm/tests/ref/showrc $ cvs diff -u -r1.37.2.4 -r1.37.2.5 showrc --- rpm/tests/ref/showrc 13 Sep 2011 01:12:53 - 1.37.2.4 +++ rpm/tests/ref/showrc 30 Sep 2011 20:19:38 - 1.37.2.5 @@ -17,8 +17,10 @@ macrofiles: ../macros/macros:../tests/macros Features provided by rpmlib installer: rpmlib(BuiltinAugeasScripts) = 5.3-1 +rpmlib(BuiltinJavaScript) = 5.2-1 rpmlib(BuiltinLuaScripts) = 4.2.2-1 rpmlib(BuiltinPythonScripts) = 5.2-1 +rpmlib(BuiltinRubyScripts) = 5.2-1 rpmlib(BuiltinTclScripts) = 5.2-1 rpmlib(CompressedFileNames) = 3.0.4-1 rpmlib(ConcurrentAccess) = 4.1-1 @@ -268,7 +270
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac devtool.conf rpm/macros/...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 13-Sep-2011 03:12:53
Branch: rpm-5_4 Handle: 2011091301125003
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac devtool.conf
rpm/macros macros.in
rpm/rpmdb db3.c dbconfig.c rpmdb.h
rpm/rpmio rpmltc.h
rpm/rubyMakefile.am
rpm/tests/ref manifest showrc
Log:
- ruby: disable "make check" until -lpcreposix gets linked correctly.
- ruby: avoid undefined @WITH_RUBY_VENDORARCHDIR@.
- crypto: rescusitate --with-libtomcrypt.
- rpmdb: stub-in DB_HEAP and heapsize configurable.
- rpmdb: macros for new db-utils.
Summary:
RevisionChanges Path
1.3501.2.171+5 -0 rpm/CHANGES
2.472.2.30 +9 -1 rpm/configure.ac
2.365.2.14 +2 -2 rpm/devtool.conf
1.39.2.18 +7 -1 rpm/macros/macros.in
1.156.2.8 +8 -0 rpm/rpmdb/db3.c
1.78.4.2+3 -1 rpm/rpmdb/dbconfig.c
1.141.2.4 +1 -0 rpm/rpmdb/rpmdb.h
1.2.4.1 +2 -2 rpm/rpmio/rpmltc.h
1.11.2.2+3 -3 rpm/ruby/Makefile.am
1.17.2.3+1 -0 rpm/tests/ref/manifest
1.37.2.4+11 -13 rpm/tests/ref/showrc
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.170 -r1.3501.2.171 CHANGES
--- rpm/CHANGES 12 Sep 2011 20:29:25 - 1.3501.2.170
+++ rpm/CHANGES 13 Sep 2011 01:12:50 - 1.3501.2.171
@@ -1,4 +1,9 @@
5.4.2 -> 5.4.3:
+- jbj: ruby: disable "make check" until -lpcreposix gets linked
correctly.
+- jbj: ruby: avoid undefined @WITH_RUBY_VENDORARCHDIR@.
+- jbj: crypto: rescusitate --with-libtomcrypt.
+- jbj: rpmdb: stub-in DB_HEAP and heapsize configurable.
+- jbj: rpmdb: macros for new db-utils.
- jbj: lua: port to lua-5.2.0-beta external.
- jbj: hdrfmt: fix: remove a memory leak.
- jbj: rpmgi: fix: load rpmdb tag value filters more carefully.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.29 -r2.472.2.30 configure.ac
--- rpm/configure.ac 6 Sep 2011 15:03:53 - 2.472.2.29
+++ rpm/configure.ac 13 Sep 2011 01:12:51 - 2.472.2.30
@@ -553,12 +553,18 @@
AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive,
$MYPATH)
AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint,
%{_bindir}/${DBXY}_checkpoint, $MYPATH)
+AC_PATH_PROG(__DB_DEADLOCK, ${DBXY}_deadlock, %{_bindir}/${DBXY}_deadlock,
$MYPATH)
AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
+AC_PATH_PROG(__DB_HOTBACKUP, ${DBXY}_hotbackup,
%{_bindir}/${DBXY}_hotbackup, $MYPATH)
AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify,
%{_bindir}/${DBXY}_log_verify, $MYPATH)
AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog,
$MYPATH)
AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover,
$MYPATH)
+AC_PATH_PROG(__DB_REPLICATE, ${DBXY}_replicate,
%{_bindir}/${DBXY}_replicate, $MYPATH)
+AC_PATH_PROG(__DBSQL, ${DBXY}_stat, %{_bindir}/${DBXY}sql, $MYPATH)
+AC_PATH_PROG(__DB_SQL_CODEGEN, ${DBXY}_stat, %{_bindir}/${DBXY}_sql_codegen,
$MYPATH)
AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
+AC_PATH_PROG(__DB_TUNER, ${DBXY}_stat, %{_bindir}/${DBXY}_tuner, $MYPATH)
AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade,
$MYPATH)
AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
@@ -1361,11 +1367,13 @@
], [])
dnl # TomCrypt
+dnl XXX FIXME: add libtomcrypt.pc
RPM_CHECK_LIB(
[TomCrypt], [tomcrypt],
-[tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt.h],
+[tomcrypt], [ltc_init_multi], [tomcrypt/tomcrypt_cfg.h],
[no,external:none], [],
[ AC_DEFINE(WITH_TOMCRYPT, 1, [Define if building with LibTomCrypt])
+ CPPFLAGS="$CPPFLAGS -I${includedir}/tomcrypt -I${includedir}/tommmath"
], [])
dnl # IBM TPM 1.2 software emulation
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.13 -r2.365.2.14 devtool.conf
--- rpm/devtool.con
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmdb/ rpmdb.h rpmre...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 06-Sep-2011 01:08:26
Branch: rpm-5_4 Handle: 2011090523082104
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmdb rpmdb.h rpmrepo.c
rpm/rpmio rpmsql.c
rpm/tests/ref showrc version
rpm/tools dbsql.c rpmrepo.c sqlite3.c
Log:
- rpmdb: stub-in db-5.2.28 support.
- rpmdb: set -I/usr/include/dbXY, remove .
Summary:
RevisionChanges Path
1.3501.2.164+2 -0 rpm/CHANGES
2.472.2.27 +16 -12 rpm/configure.ac
1.141.2.3 +1 -1 rpm/rpmdb/rpmdb.h
1.4.2.1 +1 -1 rpm/rpmdb/rpmrepo.c
2.59.2.1+1 -1 rpm/rpmio/rpmsql.c
1.37.2.3+12 -12 rpm/tests/ref/showrc
1.5.2.3 +2 -2 rpm/tests/ref/version
2.15.2.1+1 -1 rpm/tools/dbsql.c
2.32.2.1+1 -1 rpm/tools/rpmrepo.c
2.4.2.1 +1 -1 rpm/tools/sqlite3.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.163 -r1.3501.2.164 CHANGES
--- rpm/CHANGES 5 Sep 2011 22:59:35 - 1.3501.2.163
+++ rpm/CHANGES 5 Sep 2011 23:08:21 - 1.3501.2.164
@@ -1,4 +1,6 @@
5.4.2 -> 5.4.3:
+- jbj: rpmdb: stub-in db-5.2.28 support.
+- jbj: rpmdb: set -I/usr/include/dbXY, remove .
- jbj: rpmtxn: fix: use DB_INIT_TXN (0x800 changes in db-5.2.28).
- jbj: rpmdb: fix: don't set PARTIAL on primary DBT through
cursor->cpget.
- jbj: tests: rescusitate api-sanity auto/* markup for 1.12.5.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.26 -r2.472.2.27 configure.ac
--- rpm/configure.ac 5 Sep 2011 13:47:47 - 2.472.2.26
+++ rpm/configure.ac 5 Sep 2011 23:08:21 - 2.472.2.27
@@ -538,6 +538,9 @@
else
MYPATH=$PATH
fi
+
+DBXY=db52
+
AC_PATH_PROG(__BASH, bash, %{_bindir}/bash, $MYPATH)
AC_PATH_PROG(__BZIP2, bzip2, %{_bindir}/bzip2, $MYPATH)
AC_PATH_PROG(__CAT, cat, /bin/cat, $MYPATH)
@@ -548,16 +551,16 @@
AC_PATH_PROG(__CPIO, cpio, /bin/cpio, $MYPATH)
AC_PATH_PROG(__CURL, curl, %{_bindir}/curl, $MYPATH)
AC_PATH_PROG(__CVS, cvs, %{_bindir}/cvs, $MYPATH)
-AC_PATH_PROG(__DB_ARCHIVE, db51_archive, %{_bindir}/db51_archive, $MYPATH)
-AC_PATH_PROG(__DB_CHECKPOINT, db51_checkpoint, %{_bindir}/db51_checkpoint,
$MYPATH)
-AC_PATH_PROG(__DB_DUMP, db51_dump, %{_bindir}/db51_dump, $MYPATH)
-AC_PATH_PROG(__DB_LOAD, db51_load, %{_bindir}/db51_load, $MYPATH)
-AC_PATH_PROG(__DB_LOG_VERIFY, db51_log_verify, %{_bindir}/db51_log_verify,
$MYPATH)
-AC_PATH_PROG(__DB_PRINTLOG, db51_printlog, %{_bindir}/db51_printlog, $MYPATH)
-AC_PATH_PROG(__DB_RECOVER, db51_recover, %{_bindir}/db51_recover, $MYPATH)
-AC_PATH_PROG(__DB_STAT, db51_stat, %{_bindir}/db51_stat, $MYPATH)
-AC_PATH_PROG(__DB_UPGRADE, db51_upgrade, %{_bindir}/db51_upgrade, $MYPATH)
-AC_PATH_PROG(__DB_VERIFY, db51_verify, %{_bindir}/db51_verify, $MYPATH)
+AC_PATH_PROG(__DB_ARCHIVE, ${DBXY}_archive, %{_bindir}/${DBXY}_archive,
$MYPATH)
+AC_PATH_PROG(__DB_CHECKPOINT, ${DBXY}_checkpoint,
%{_bindir}/${DBXY}_checkpoint, $MYPATH)
+AC_PATH_PROG(__DB_DUMP, ${DBXY}_dump, %{_bindir}/${DBXY}_dump, $MYPATH)
+AC_PATH_PROG(__DB_LOAD, ${DBXY}_load, %{_bindir}/${DBXY}_load, $MYPATH)
+AC_PATH_PROG(__DB_LOG_VERIFY, ${DBXY}_log_verify,
%{_bindir}/${DBXY}_log_verify, $MYPATH)
+AC_PATH_PROG(__DB_PRINTLOG, ${DBXY}_printlog, %{_bindir}/${DBXY}_printlog,
$MYPATH)
+AC_PATH_PROG(__DB_RECOVER, ${DBXY}_recover, %{_bindir}/${DBXY}_recover,
$MYPATH)
+AC_PATH_PROG(__DB_STAT, ${DBXY}_stat, %{_bindir}/${DBXY}_stat, $MYPATH)
+AC_PATH_PROG(__DB_UPGRADE, ${DBXY}_upgrade, %{_bindir}/${DBXY}_upgrade,
$MYPATH)
+AC_PATH_PROG(__DB_VERIFY, ${DBXY}_verify, %{_bindir}/${DBXY}_verify, $MYPATH)
AC_PATH_PROG(__DIFF, diff, /bin/diff, $MYPATH)
AC_PATH_PROG(__DITTO, ditto, %{_bindir}/ditto, $MYPATH)
AC_PATH_PROG(__FILE, file, %{_bindir}/file, $MYPATH)
@@ -1483,9 +1486,10 @@
dnl # Berkeley-DB & SQLite
DBLIBSRCS=""
+CPPFLAGS="${CPPFLAGS} -I${includedir}/${DBXY}"
RPM_CHECK_LIB(
[Berkeley-DB], [db],
-[db-5.1], [db_create], [db51/db.h],
+[db-5.2], [db_create], [db.h],
[yes,external], [db3],
[ DBLIBSRCS="$DBLIBSRCS db3.c"
AM_CONDITIONAL(WITH_DB, [ true ])
@@ -1512,7 +1516,7 @@
dnl XXX error: `db3' is already regi
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 05-Sep-2011 15:47:47 Branch: rpm-5_4 Handle: 2011090513474601 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - start 5.4.3 development. Summary: RevisionChanges Path 1.3501.2.156+4 -1 rpm/CHANGES 2.472.2.26 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.155 -r1.3501.2.156 CHANGES --- rpm/CHANGES 5 Sep 2011 12:35:19 - 1.3501.2.155 +++ rpm/CHANGES 5 Sep 2011 13:47:46 - 1.3501.2.156 @@ -1,4 +1,7 @@ -5.4.1 -> 5.4.2 +5.4.2 -> 5.4.3: +- jbj: start 5.4.3 development. + +5.4.1 -> 5.4.2: - jbj: i18n: update PO files (Translation Project). - jbj: fix: ensure that integer CDATA is initialized to "" when missing. - jbj: fix: subdir is needed to find loader maps. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.25 -r2.472.2.26 configure.ac --- rpm/configure.ac 28 Jun 2011 12:26:10 - 2.472.2.25 +++ rpm/configure.ac 5 Sep 2011 13:47:47 - 2.472.2.26 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.2],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2011-06-02" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.4.3],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2011-09-05" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/tools/ dbconvert.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: 28-Jun-2011 14:26:11 Branch: rpm-5_4 Handle: 2011062812261001 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/tools dbconvert.c Log: merge from HEAD afb patch portability of endian Summary: RevisionChanges Path 1.3501.2.144+1 -0 rpm/CHANGES 2.472.2.25 +2 -2 rpm/configure.ac 2.1.2.6 +10 -1 rpm/tools/dbconvert.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.143 -r1.3501.2.144 CHANGES --- rpm/CHANGES 28 Jun 2011 12:01:47 - 1.3501.2.143 +++ rpm/CHANGES 28 Jun 2011 12:26:10 - 1.3501.2.144 @@ -1,4 +1,5 @@ 5.4.1 -> 5.4.2 +- devzero2000: merge afb patch portability of endian - proyvind: check-multiarch-files: remove unnecessary import of MDK::Common, causing undesired dependency from perl dependency generator. - devzero2000: add a simple usage command to devtool @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.24 -r2.472.2.25 configure.ac --- rpm/configure.ac 20 Jun 2011 12:33:27 - 2.472.2.24 +++ rpm/configure.ac 28 Jun 2011 12:26:10 - 2.472.2.25 @@ -672,8 +672,8 @@ dnl # standard headers (generic) AC_CHECK_HEADERS([dnl fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl -signal.h sys/ipc.h sys/socket.h sys/select.h sys/time.h dnl -sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl +signal.h sys/endian.h sys/ipc.h sys/socket.h sys/select.h dnl +sys/time.h sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl @@ . patch -p0 <<'@@ .' Index: rpm/tools/dbconvert.c $ cvs diff -u -r2.1.2.5 -r2.1.2.6 dbconvert.c --- rpm/tools/dbconvert.c 2 Jun 2011 17:39:41 - 2.1.2.5 +++ rpm/tools/dbconvert.c 28 Jun 2011 12:26:11 - 2.1.2.6 @@ -18,9 +18,18 @@ #include #include +#ifdef HAVE_SYS_ENDIAN_H +#include +#endif +#ifdef __APPLE__ +#include + +#define htobe32(x) OSSwapHostToBigInt32(x) +#define htole32(x) OSSwapHostToLittleInt32(x) +#endif /* __APPLE__ */ #if BYTE_ORDER == LITTLE_ENDIAN #define bswap32(x) htobe32(x) -#elif __BYTE_ORDER == BIG_ENDIAN +#elif BYTE_ORDER == BIG_ENDIAN #define bswap32(x) htole32(x) #endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ 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: 07-Jun-2011 17:37:39
Branch: rpm-5_4 Handle: 2011060715373800
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/macros macros.in
Log:
revert latest commit
Summary:
RevisionChanges Path
1.3501.2.137+0 -3 rpm/CHANGES
2.472.2.23 +0 -16 rpm/configure.ac
1.39.2.14 +2 -2 rpm/macros/macros.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.136 -r1.3501.2.137 CHANGES
--- rpm/CHANGES 7 Jun 2011 14:01:50 - 1.3501.2.136
+++ rpm/CHANGES 7 Jun 2011 15:37:38 - 1.3501.2.137
@@ -1,7 +1,4 @@
5.4.1 -> 5.4.2
-- devzero2000: define the scriplet_requires macro
- as /bin/bash --rpm-requires only if bash have the
- required patch.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.22 -r2.472.2.23 configure.ac
--- rpm/configure.ac 7 Jun 2011 14:01:51 - 2.472.2.22
+++ rpm/configure.ac 7 Jun 2011 15:37:38 - 2.472.2.23
@@ -390,22 +390,6 @@
AC_DEFINE([RPMVERCMP_DIGITS_BEAT_ALPHA],[1],[Permit in RPM version
comparison that digits beat alpha])
])
-dnl # Check if bash have the --rpm-requires patch
-dnl # If so define the scriptlet_requires output variable
-dnl # to "bash --rpm-requires"
-dnl # and BASH_RPM_REQUIRES to the bash absolute path
-AC_CACHE_CHECK([for bash if supports --rpm-requires],
[ac_cv_path_BASH_RPM_REQUIRES],
- [AC_PATH_PROGS_FEATURE_CHECK([BASH_RPM_REQUIRES], [bash],
-[[ bash_rpm_requires_out=`echo ls | $ac_path_BASH_RPM_REQUIRES
--rpm-requires | grep "executable(ls)"`
- test "x$bash_rpm_requires_out" != x \
- && ac_cv_path_BASH_RPM_REQUIRES=$ac_path_BASH_RPM_REQUIRES
scriptlet_requires="$ac_path_BASH_RPM_REQUIRES --rpm-requires"
-]],
-[[ scriptlet_requires="%{nil}" ]], [$PATH]
-)])
-AS_IF([test "x$ac_cv_path_BASH_RPM_REQUIRES" != x],
- [AC_SUBST([BASH_RPM_REQUIRES],[$ac_cv_path_BASH_RPM_REQUIRES])],
- [AC_SUBST([BASH_RPM_REQUIRES],[:])])
-AC_SUBST([scriptlet_requires])
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.39.2.13 -r1.39.2.14 macros.in
--- rpm/macros/macros.in 7 Jun 2011 14:01:51 - 1.39.2.13
+++ rpm/macros/macros.in 7 Jun 2011 15:37:38 - 1.39.2.14
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.13 2011/06/07 14:01:51 devzero2000 Exp $
+# $Id: macros.in,v 1.39.2.14 2011/06/07 15:37:38 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
@@ -925,7 +925,7 @@
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
#%__executable_provides %{_rpmhome}/executabledeps.sh --provides
#%__executable_requires %{_rpmhome}/executabledeps.sh --requires
-%__scriptlet_requires@scriptlet_requires@
+%__scriptlet_requires%{__bash} --rpm-requires
#==
# XXX Caveat:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ 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: 07-Jun-2011 16:01:52
Branch: rpm-5_4 Handle: 2011060714015001
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/macros macros.in
Log:
define the scriplet_requires macro
as /bin/bash --rpm-requires only if bash have the
required patch.
Submitted by: Elia Pinto
Summary:
RevisionChanges Path
1.3501.2.136+3 -0 rpm/CHANGES
2.472.2.22 +16 -0 rpm/configure.ac
1.39.2.13 +2 -2 rpm/macros/macros.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.135 -r1.3501.2.136 CHANGES
--- rpm/CHANGES 7 Jun 2011 13:11:42 - 1.3501.2.135
+++ rpm/CHANGES 7 Jun 2011 14:01:50 - 1.3501.2.136
@@ -1,4 +1,7 @@
5.4.1 -> 5.4.2
+- devzero2000: define the scriplet_requires macro
+ as /bin/bash --rpm-requires only if bash have the
+ required patch.
- proyvind: don't pick up python version from python egg, rely on path
only in stead to avoid incorrect version dependencies if any other
egg metadata for other versions is found.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.21 -r2.472.2.22 configure.ac
--- rpm/configure.ac 2 Jun 2011 21:15:21 - 2.472.2.21
+++ rpm/configure.ac 7 Jun 2011 14:01:51 - 2.472.2.22
@@ -390,6 +390,22 @@
AC_DEFINE([RPMVERCMP_DIGITS_BEAT_ALPHA],[1],[Permit in RPM version
comparison that digits beat alpha])
])
+dnl # Check if bash have the --rpm-requires patch
+dnl # If so define the scriptlet_requires output variable
+dnl # to "bash --rpm-requires"
+dnl # and BASH_RPM_REQUIRES to the bash absolute path
+AC_CACHE_CHECK([for bash if supports --rpm-requires],
[ac_cv_path_BASH_RPM_REQUIRES],
+ [AC_PATH_PROGS_FEATURE_CHECK([BASH_RPM_REQUIRES], [bash],
+[[ bash_rpm_requires_out=`echo ls | $ac_path_BASH_RPM_REQUIRES
--rpm-requires | grep "executable(ls)"`
+ test "x$bash_rpm_requires_out" != x \
+ && ac_cv_path_BASH_RPM_REQUIRES=$ac_path_BASH_RPM_REQUIRES
scriptlet_requires="$ac_path_BASH_RPM_REQUIRES --rpm-requires"
+]],
+[[ scriptlet_requires="%{nil}" ]], [$PATH]
+)])
+AS_IF([test "x$ac_cv_path_BASH_RPM_REQUIRES" != x],
+ [AC_SUBST([BASH_RPM_REQUIRES],[$ac_cv_path_BASH_RPM_REQUIRES])],
+ [AC_SUBST([BASH_RPM_REQUIRES],[:])])
+AC_SUBST([scriptlet_requires])
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.in
$ cvs diff -u -r1.39.2.12 -r1.39.2.13 macros.in
--- rpm/macros/macros.in 11 Apr 2011 00:34:48 - 1.39.2.12
+++ rpm/macros/macros.in 7 Jun 2011 14:01:51 - 1.39.2.13
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.39.2.12 2011/04/11 00:34:48 jbj Exp $
+# $Id: macros.in,v 1.39.2.13 2011/06/07 14:01:51 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
@@ -925,7 +925,7 @@
# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
#%__executable_provides %{_rpmhome}/executabledeps.sh --provides
#%__executable_requires %{_rpmhome}/executabledeps.sh --requires
-%__scriptlet_requires%{__bash} --rpm-requires
+%__scriptlet_requires@scriptlet_requires@
#==
# XXX Caveat:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm.spec.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 02-Jun-2011 23:15:22
Branch: rpm-5_4 Handle: 2011060221152100
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac rpm.spec.in
Log:
updated changelog in rpm.spec.in
tagged 5.4.2 release in configure.ac
Submitted by: mdawkins
Summary:
RevisionChanges Path
1.3501.2.134+4 -0 rpm/CHANGES
2.472.2.21 +2 -2 rpm/configure.ac
2.458.2.2 +3 -0 rpm/rpm.spec.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.133 -r1.3501.2.134 CHANGES
--- rpm/CHANGES 27 May 2011 13:50:12 - 1.3501.2.133
+++ rpm/CHANGES 2 Jun 2011 21:15:21 - 1.3501.2.134
@@ -1,3 +1,7 @@
+5.4.1 -> 5.4.2
+ - mdawkins: updated changelog in rpm.spec.in
+ - mdawkins: tagged 5.4.2 release in configure.ac
+
5.4.0 -> 5.4.1:
- devzero2000: In fpLookupSubdir, data returned by hash should be of type
"struct rpmffi_s **" instead of "struct rpmffi_s *" to avoid
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.20 -r2.472.2.21 configure.ac
--- rpm/configure.ac 23 May 2011 14:11:06 - 2.472.2.20
+++ rpm/configure.ac 2 Jun 2011 21:15:21 - 2.472.2.21
@@ -8,8 +8,8 @@
AC_PREREQ(2.63)
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.4.1],[PACKAGE_BUGREPORT_DEFAULT])
-PACKAGE_TIMESTAMP="2010-12-29" dnl # [-MM[-DD[ HH[:MM
+AC_INIT([rpm],[5.4.2],[PACKAGE_BUGREPORT_DEFAULT])
+PACKAGE_TIMESTAMP="2011-06-02" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
AC_MSG_HEADER([INITIALIZATION])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.458.2.1 -r2.458.2.2 rpm.spec.in
--- rpm/rpm.spec.in 6 Dec 2010 23:04:47 - 2.458.2.1
+++ rpm/rpm.spec.in 2 Jun 2011 21:15:21 - 2.458.2.2
@@ -656,6 +656,9 @@
###%{_rpmhome}/lib/librpmjsm.so
%changelog
+* Thu Jun 02 2011 mdawkins 5.4.2-0.20110602
+- new snapshot date 20110602 for release 5.4.2
+
* Sat Oct 23 2010 Jeff Johnson - 5.3.5-0.1
- resurrect rpm.spec.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/macros/ fedora.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: 23-May-2011 16:11:07
Branch: rpm-5_4 Handle: 2011052314110601
Added files: (Branch: rpm-5_4)
rpm/macros fedora.in
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
added fedora per platform macro from redhat-rpm-config
Summary:
RevisionChanges Path
1.3501.2.131+1 -0 rpm/CHANGES
2.472.2.20 +1 -1 rpm/configure.ac
1.1.2.2 +291 -0 rpm/macros/fedora.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.130 -r1.3501.2.131 CHANGES
--- rpm/CHANGES 23 May 2011 13:49:17 - 1.3501.2.130
+++ rpm/CHANGES 23 May 2011 14:11:06 - 1.3501.2.131
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+- devzero2000: added fedora per platform macro from redhat-rpm-config
- devzero2000: added suse to the per vendor change configure.ac enabler
- devzero2000: added suse.in macros file from rpm-4.9.0-122
(http://tinyurl.com/3vo287b)
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.19 -r2.472.2.20 configure.ac
--- rpm/configure.ac 23 May 2011 13:49:17 - 2.472.2.19
+++ rpm/configure.ac 23 May 2011 14:11:06 - 2.472.2.20
@@ -2343,7 +2343,7 @@
rpmdb/DB_CONFIG
macros/macros macros/macros.rpmbuild
macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool
-macros/mandriva macros/suse macros/mono macros/perl macros/pkgconfig
macros/php
+macros/mandriva macros/suse macros/fedora macros/mono macros/perl
macros/pkgconfig macros/php
macros/python macros/ruby macros/selinux macros/tcl
doc/Makefile
doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/fedora.in
$ cvs diff -u -r0 -r1.1.2.2 fedora.in
--- /dev/null 2011-05-23 16:11:00.0 +0200
+++ fedora.in 2011-05-23 16:11:07.496713221 +0200
@@ -0,0 +1,291 @@
+%distribution@RPMCANONVENDOR@ Linux
+%vendor @RPMCANONVENDOR@
+%bugurl http://bugzilla.redhat.com
+%disturl http://software.open@RPMCANONVENDOR@.org
+#
+# Below are the fedora/redhat macros
+# contained in redhat-rpm-config
+#
+# Per-platform rpm configuration file.
+
+#==
+# per-platform macros.
+#
+%_vendor @RPMCANONVENDOR@
+%_os linux
+%_target_platform%{_target_cpu}-%{_vendor}-%{_target_os}%{?_gnu}
+
+#==
+# configure macros. note that most of these are inherited
+# from the defaults.
+#
+%_prefix /usr
+%_sysconfdir /etc
+%_localstatedir /var
+%_infodir/usr/share/info
+%_mandir /usr/share/man
+
+%_defaultdocdir %{_usr}/share/doc
+
+%_fmoddir%{_libdir}/gfortran/modules
+
+%_enable_debug_packages 1
+
+#==
+# configure and makeinstall.
+#
+%_configure ./configure
+%configure \
+ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
+ %{_configure} --build=%{_build} --host=%{_host} \\\
+ --program-prefix=%{?_program_prefix} \\\
+ --disable-dependency-tracking \\\
+ --prefix=%{_prefix} \\\
+ --exec-prefix=%{_exec_prefix} \\\
+ --bindir=%{_bindir} \\\
+ --sbindir=%{_sbindir} \\\
+ --sysconfdir=%{_sysconfdir} \\\
+ --datadir=%{_datadir} \\\
+ --includedir=%{_includedir} \\\
+ --libdir=%{_libdir} \\\
+ --libexecdir=%{_libexecdir} \\\
+ --localstatedir=%{_localstatedir} \\\
+ --sharedstatedir=%{_sharedstatedir} \\\
+ --mandir=%{_mandir} \\\
+ --infodir=%{_infodir}
+
+%makeinstall \
+ %{__make} \\\
+ prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
+ exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
+ bindir=%{?buildroot:%{buildroot}}%{_bindir
[CVS] RPM: rpm-5_4: 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-May-2011 15:49:17 Branch: rpm-5_4 Handle: 2011052313491700 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: added suse to the per vendor change configure.ac enabler. Probably should be possible to simplify this autofu Summary: RevisionChanges Path 1.3501.2.130+1 -0 rpm/CHANGES 2.472.2.19 +3 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.129 -r1.3501.2.130 CHANGES --- rpm/CHANGES 23 May 2011 12:27:35 - 1.3501.2.129 +++ rpm/CHANGES 23 May 2011 13:49:17 - 1.3501.2.130 @@ -1,4 +1,5 @@ 5.4.0 -> 5.4.1: +- devzero2000: added suse to the per vendor change configure.ac enabler - devzero2000: added suse.in macros file from rpm-4.9.0-122 (http://tinyurl.com/3vo287b) - devzero2000: resurrect openwall (owl) vendor detection @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.18 -r2.472.2.19 configure.ac --- rpm/configure.ac 23 May 2011 12:27:34 - 2.472.2.18 +++ rpm/configure.ac 23 May 2011 13:49:17 - 2.472.2.19 @@ -2306,6 +2306,9 @@ "openmamba") AC_DEFINE([RPM_VENDOR_OPENMAMBA], 1, Vendor is openmamba) ;; + "suse") + AC_DEFINE([RPM_VENDOR_SUSE], 1, Vendor is suse) + ;; esac AC_MSG_RESULT([$withval]) else @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: 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-May-2011 15:07:55
Branch: rpm-5_4 Handle: 2011052013075500
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
Log:
Resurrect openwall (owl) vendor detection
(http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/rpm/rpm-4.2-owl-vendor-setup.diff?rev=1.3;content-type=text%2Fplain)
They are using rpm 4.2 with, apparently, the missing CVE-2010-2059 patch.
This is strange enough
i think http://www.openwall.com/lists/oss-security/2010/06/02/2.
Submitted by: Elia Pinto
Summary:
RevisionChanges Path
1.3501.2.128+4 -0 rpm/CHANGES
2.472.2.17 +1 -0 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.127 -r1.3501.2.128 CHANGES
--- rpm/CHANGES 18 May 2011 13:34:34 - 1.3501.2.127
+++ rpm/CHANGES 20 May 2011 13:07:55 - 1.3501.2.128
@@ -1,4 +1,8 @@
5.4.0 -> 5.4.1:
+- devzero2000: resurrect openwall (owl) vendor detection
+
(http://cvsweb.openwall.com/cgi/cvsweb.cgi/~checkout~/Owl/packages/rpm/rpm-4.2-owl-vendor-setup.diff?rev=1.3;content-type=text%2Fplain)
+ They are using rpm 4.2 with, apparently, the missing CVE-2010-2059
patch. This is strange enough
+ i think http://www.openwall.com/lists/oss-security/2010/06/02/2.
- devzero2000: Sort file list for debuginfo extraction.
(inspired by Robert Schiele
http://lists.rpm.org/pipermail/rpm-list/2011-May/000894.html)
- proyvind: update doxygen input filename paths.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.16 -r2.472.2.17 configure.ac
--- rpm/configure.ac 7 May 2011 23:29:11 - 2.472.2.16
+++ rpm/configure.ac 20 May 2011 13:07:55 - 2.472.2.17
@@ -1979,6 +1979,7 @@
case "${target_vendor}" in
unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark|momonga|openmamba)
test -f /etc/momonga-release && RPMCANONVENDOR=momonga
+test -f /etc/owl-release -o -f /etc/owl-setup.conf -o -d /etc/mtree
&& RPMCANONVENDOR=openwall
test -f /etc/fedora-release && RPMCANONVENDOR=fedora
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
test -f /etc/pld-release && RPMCANONVENDOR=pld
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/rpmdb/ rpmevr.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: 20-Apr-2011 17:57:00 Branch: rpm-5_4 Handle: 2011042015565901 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/rpmdb rpmevr.c Log: permit in configure phase to --enable-rpmvercmp-digits-beat-alpha for reverting to the old rpmvercmp behavior where digits beat alpha as used by Mandriva, Fedora, Suse and other (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) Summary: RevisionChanges Path 1.3501.2.118+4 -0 rpm/CHANGES 2.472.2.15 +13 -0 rpm/configure.ac 1.37.2.2+1 -1 rpm/rpmdb/rpmevr.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.117 -r1.3501.2.118 CHANGES --- rpm/CHANGES 20 Apr 2011 10:57:41 - 1.3501.2.117 +++ rpm/CHANGES 20 Apr 2011 15:56:59 - 1.3501.2.118 @@ -1,4 +1,8 @@ 5.4.0 -> 5.4.1: +- devzero2000: permit in configure phase to + --enable-rpmvercmp-digits-beat-alpha for reverting to the old rpmvercmp + behavior where digits beat alpha as used by Mandriva, Fedora, Suse + and other (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) - jbj: mongo: adjust --json spewage to accomodate mongo syntax. - devzero2000: get rid of rindex everywhere: use SUSv3 strrchr instead - jbj: mongo: templating diddle-ups, use new Date(...) in other.mongo. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.14 -r2.472.2.15 configure.ac --- rpm/configure.ac 10 Apr 2011 10:54:19 - 2.472.2.14 +++ rpm/configure.ac 20 Apr 2011 15:56:59 - 2.472.2.15 @@ -377,6 +377,19 @@ ]) +dnl # Permit to revert to the old rpmvercmp behavior where digits beat alpha +dnl # called in VENDOR old-comparision-behaviour +AC_ARG_ENABLE( +[rpmvercmp-digits-beat-alpha], +AS_HELP_STRING([--enable-rpmvercmp-digits-beat-alpha],[Permit in RPM version comparison that digits beat alpha (default:no)]), +[ do_rpmvercmp_digits_beat_alpha=$enableval ], +[ do_rpmvercmp_digits_beat_alpha=no ]) + +AS_IF([test "x$do_rpmvercmp_digits_beat_alpha" != xno], + [ + AC_DEFINE([RPMVERCMP_DIGITS_BEAT_ALPHA],[1],[Permit in RPM version comparison that digits beat alpha]) + ]) + dnl # FIXME: partly Linux-specific only!? dnl # (but at least it usually doesn't harm on other platforms) CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT" @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.37.2.1 -r1.37.2.2 rpmevr.c --- rpm/rpmdb/rpmevr.c17 Jan 2011 11:27:55 - 1.37.2.1 +++ rpm/rpmdb/rpmevr.c20 Apr 2011 15:57:00 - 1.37.2.2 @@ -48,7 +48,7 @@ /* XXX Force digits to beat alphas. See bugzilla #50977. */ /*@unchecked@*/ -#if defined(RPM_VENDOR_MANDRIVA) /* old-comparision-behaviour */ +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPMVERCMP_DIGITS_BEAT_ALPHA) /* old-comparision-behaviour */ static int _invert_digits_alphas_comparison = -1; #else static int _invert_digits_alphas_comparison = 1; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 03-Apr-2011 21:14:08 Branch: rpm-5_4 Handle: 2011040319140700 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - autofu: drop --with-js=internal now that JS 1.8.5 is available. Summary: RevisionChanges Path 1.3501.2.94 +1 -0 rpm/CHANGES 2.472.2.13 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.93 -r1.3501.2.94 CHANGES --- rpm/CHANGES 2 Apr 2011 18:19:30 - 1.3501.2.93 +++ rpm/CHANGES 3 Apr 2011 19:14:07 - 1.3501.2.94 @@ -1,4 +1,5 @@ 5.4.0 -> 5.4.1: +- jbj: autofu: drop --with-js=internal now that JS 1.8.5 is available. - mdawkins: i18n update cs.po da.po de.po es.po fi.po fr.po id.po is.po it.po ja.po ko.po nb.po nl.po pa.po pl.po pt.po pt_BR.po ru.po sk.po sl.po sr.po sv.po tr.po uk.po vi.po zh_TW.po @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.12 -r2.472.2.13 configure.ac --- rpm/configure.ac 2 Apr 2011 02:04:23 - 2.472.2.12 +++ rpm/configure.ac 3 Apr 2011 19:14:07 - 2.472.2.13 @@ -1621,7 +1621,7 @@ RPM_CHECK_LIB( [JavaScript], [mozjs185], [mozjs185], [JS_NewContext], [jsapi.h], -[no,internal:external:none], [mozjs185:src:src], +[no,external:none], [mozjs185:src:src], [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then WITH_SPIDERMONKEY_SUBDIR="$WITH_JS_SUBDIR/src" AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'mozjs185' library (-lmozjs185).]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/js/ Makefile.am rpma...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Ãyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 02-Apr-2011 04:04:24
Branch: rpm-5_4 Handle: 2011040202042201
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/js Makefile.am rpmaug-js.c rpmjs-debug.h
Log:
rpmjs: port to SpiderMonkey 1.8.5 API.
Summary:
RevisionChanges Path
1.3501.2.92 +1 -0 rpm/CHANGES
2.472.2.12 +4 -4 rpm/configure.ac
1.44.2.1+1 -1 rpm/js/Makefile.am
1.11.4.1+22 -16 rpm/js/rpmaug-js.c
1.7.4.1 +4 -4 rpm/js/rpmjs-debug.h
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.91 -r1.3501.2.92 CHANGES
--- rpm/CHANGES 1 Apr 2011 09:52:56 - 1.3501.2.91
+++ rpm/CHANGES 2 Apr 2011 02:04:22 - 1.3501.2.92
@@ -1,4 +1,5 @@
5.4.0 -> 5.4.1:
+- proyvind: rpmjs: port to SpiderMonkey 1.8.5 API.
- proyvind: mandriva: filter overlapping depencies.
- proyvind: rubygems.rb: add/provide ruby(abi) dependencies for non-gems.
- proyvind: rpmfc: add classifiers for gstreamer plugins & dep generator.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.11 -r2.472.2.12 configure.ac
--- rpm/configure.ac 1 Apr 2011 05:16:19 - 2.472.2.11
+++ rpm/configure.ac 2 Apr 2011 02:04:23 - 2.472.2.12
@@ -1619,12 +1619,12 @@
WITH_JS_SUBDIR=""
WITH_SPIDERMONKEY_SUBDIR=""
RPM_CHECK_LIB(
-[JavaScript], [js],
-[js], [JS_NewContext], [jsapi.h],
-[no,internal:external:none], [js:src:src],
+[JavaScript], [mozjs185],
+[mozjs185], [JS_NewContext], [jsapi.h],
+[no,internal:external:none], [mozjs185:src:src],
[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
WITH_SPIDERMONKEY_SUBDIR="$WITH_JS_SUBDIR/src"
- AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'js' library
(-ljs).])
+ AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'mozjs185'
library (-lmozjs185).])
else
WITH_JS_SUBDIR=js
fi
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
$ cvs diff -u -r1.44 -r1.44.2.1 Makefile.am
--- rpm/js/Makefile.am18 Sep 2010 14:12:57 - 1.44
+++ rpm/js/Makefile.am2 Apr 2011 02:04:23 - 1.44.2.1
@@ -22,7 +22,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
- @WITH_JS_CPPFLAGS@ \
+ @WITH_MOZJS185_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_GPSEE_CPPFLAGS@ \
@WITH_SYCK_CPPFLAGS@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmaug-js.c
$ cvs diff -u -r1.11 -r1.11.4.1 rpmaug-js.c
--- rpm/js/rpmaug-js.c10 Jan 2010 18:29:12 - 1.11
+++ rpm/js/rpmaug-js.c2 Apr 2011 02:04:23 - 1.11.4.1
@@ -303,18 +303,18 @@
}
static JSFunctionSpec rpmaug_funcs[] = {
-JS_FS("defvar", rpmaug_defvar, 0,0,0),
-JS_FS("get", rpmaug_get, 0,0,0),
-JS_FS("set", rpmaug_set, 0,0,0),
-JS_FS("insert", rpmaug_insert, 0,0,0),
-JS_FS("rm", rpmaug_rm, 0,0,0),
-JS_FS("remove", rpmaug_rm, 0,0,0),
-JS_FS("mv", rpmaug_mv, 0,0,0),
-JS_FS("move",rpmaug_mv, 0,0,0),
-JS_FS("match", rpmaug_match, 0,0,0),
-JS_FS("save",rpmaug_save,0,0,0),
-JS_FS("load",rpmaug_load,0,0,0),
-JS_FS("print", rpmaug_print, 0,0,0),
+JS_FS("defvar", rpmaug_defvar, 0,0),
+JS_FS("get", rpmaug_get, 0,0),
+JS_FS("set", rpmaug_set, 0,0),
+JS_FS("insert", rpmaug_insert, 0,0),
+JS_FS("rm", rpmaug_rm, 0,0),
+JS_FS("remove", rpmaug_rm, 0,0),
+JS_FS("mv", rpmaug_mv, 0,0),
+JS_FS("move",rpmaug_mv, 0,0),
+JS_FS("match", rpmaug_match, 0,0),
+JS_FS("save",rpmaug_save,0,0),
+JS_FS("load",rpmaug_load,0,0),
+JS_FS("print", rpmaug_print, 0,0),
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ 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: 25-Mar-2011 17:22:42 Branch: rpm-5_4 Handle: 2011032516224101 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac rpm/lib rpmluaext.c Log: permit in configure phase to enable the --enable-rpm-lua-extensions-based-on-rpmlib used by OpenPKG today and, for rpm.vercmp, by rpm.org (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) Submitted by: Elia Pinto Summary: RevisionChanges Path 1.3501.2.76 +3 -0 rpm/CHANGES 2.472.2.10 +13 -0 rpm/configure.ac 2.8.6.1 +1 -1 rpm/lib/rpmluaext.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.75 -r1.3501.2.76 CHANGES --- rpm/CHANGES 24 Mar 2011 21:26:14 - 1.3501.2.75 +++ rpm/CHANGES 25 Mar 2011 16:22:41 - 1.3501.2.76 @@ -1,4 +1,7 @@ 5.4.0 -> 5.4.1: +- devzero2000: permit in configure phase to enable the + --enable-rpm-lua-extensions-based-on-rpmlib used by OpenPKG today + and, for rpm.vercmp, by rpm.org (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) - jbj: add a --nofsync popt alias (caveat: experimental & risky). - jbj: checksig: check explictly for per-item failures after iterating. - proyvind: always run %clean so it won't be required in .spec file. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.9 -r2.472.2.10 configure.ac --- rpm/configure.ac 24 Mar 2011 22:44:02 - 2.472.2.9 +++ rpm/configure.ac 25 Mar 2011 16:22:42 - 2.472.2.10 @@ -364,6 +364,19 @@ ]) +dnl # Adds RPM Lua extensions based on rpmlib functionality +AC_ARG_ENABLE( +[rpm-lua-extensions-based-on-rpmlib], +AS_HELP_STRING([--enable-rpm-lua-extensions-based-on-rpmlib],[Adds RPM Lua extensions based on rpmlib functionality (default:no)]), +[ do_rpm_lua_extensions_based_on_rpmlib=$enableval ], +[ do_rpm_lua_extensions_based_on_rpmlib=no ]) + +AS_IF([test "x$do_rpm_lua_extensions_based_on_rpmlib" != xno], + [ + AC_DEFINE([RPM_LUA_EXTENSIONS_BASED_ON_RPMLIB],[1],[Adds RPM Lua extensions based on rpmlib functionality]) + ]) + + dnl # FIXME: partly Linux-specific only!? dnl # (but at least it usually doesn't harm on other platforms) CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT" @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmluaext.c $ cvs diff -u -r2.8 -r2.8.6.1 rpmluaext.c --- rpm/lib/rpmluaext.c 26 Mar 2009 18:07:31 - 2.8 +++ rpm/lib/rpmluaext.c 25 Mar 2011 16:22:42 - 2.8.6.1 @@ -2,7 +2,7 @@ * \file lib/rpmluaext.c */ -#if defined(RPM_VENDOR_OPENPKG) /* rpm-lua-extensions-based-on-rpm-lib-functionality */ +#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_LUA_EXTENSIONS_BASED_ON_RPMLIB) /* rpm-lua-extensions-based-on-rpm-lib-functionality */ #include "system.h" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac rpm/lib/ depends.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: 25-Feb-2011 10:26:35
Branch: rpm-5_4 Handle: 2011022509263401
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/lib depends.c
Log:
permit in configure phase to enable the
optional-dirname-and-symlink-deps used by Mandriva and Ark today
(ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
Summary:
RevisionChanges Path
1.3501.2.63 +3 -0 rpm/CHANGES
2.472.2.8 +13 -0 rpm/configure.ac
1.461.4.5 +4 -4 rpm/lib/depends.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3501.2.62 -r1.3501.2.63 CHANGES
--- rpm/CHANGES 24 Feb 2011 19:33:15 - 1.3501.2.62
+++ rpm/CHANGES 25 Feb 2011 09:26:34 - 1.3501.2.63
@@ -1,4 +1,7 @@
5.4.0 -> 5.4.1:
+- devzero2000: permit in configure phase to enable the
+ optional-dirname-and-symlink-deps used by Mandriva and Ark today
+ (ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
- proyvind: use expanded %{___NVRA} for 'rpm --last'.
- jbj: valgrind: fix: typ in macros building w/o .
- proyvind: set mi->mi_count in rpmmiCount() when db cursor exists rather
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.472.2.7 -r2.472.2.8 configure.ac
--- rpm/configure.ac 9 Jan 2011 03:55:21 - 2.472.2.7
+++ rpm/configure.ac 25 Feb 2011 09:26:34 - 2.472.2.8
@@ -351,6 +351,19 @@
[ENABLE_BUILD_LAFILES],
[test ".$do_build_lafiles" = .yes])
+dnl # optional sysmlink and parentdir dependency
+AC_ARG_ENABLE(
+[dirname-and-symlink-deps],
+AS_HELP_STRING([--disable-dirname-and-symlink-deps],[permit to disable
via macro the automatic dirname and symlink dependecy]),
+[ do_optional_dirname_and_symlink_deps=$enableval ],
+[ do_optional_dirname_and_symlink_deps=yes ])
+
+AS_IF([test "x$do_optional_dirname_and_symlink_deps" != xyes],
+ [
+ AC_DEFINE([RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS],[1],[permit to disable
via macro the automatic dirname and symlink dependecy])
+ ])
+
+
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
$ cvs diff -u -r1.461.4.4 -r1.461.4.5 depends.c
--- rpm/lib/depends.c 8 Jan 2011 23:10:10 - 1.461.4.4
+++ rpm/lib/depends.c 25 Feb 2011 09:26:35 - 1.461.4.5
@@ -1567,7 +1567,7 @@
int terminate = 2; /* XXX terminate if rc >= terminate */
int rc;
int ourrc = 0;
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
int dirname_deps;
int symlink_deps;
#endif
@@ -1646,7 +1646,7 @@
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
dirname_deps =
rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}");
if (dirname_deps) {
#endif
@@ -1690,7 +1690,7 @@
/*@switchbreak@*/ break;
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
}
symlink_deps =
rpmExpandNumeric("%{?_check_symlink_deps}%{?!_check_symlink_deps:1}");
@@ -1738,7 +1738,7 @@
/*@switchbreak@*/ break;
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
}
#endif
@@ .
__
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 27-Dec-2010 23:05:46 Branch: rpm-5_4 Handle: 2010122722054500 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - 5.4.0 -> 5.4.1. Summary: RevisionChanges Path 1.3501.2.28 +2 -0 rpm/CHANGES 2.472.2.4 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.27 -r1.3501.2.28 CHANGES --- rpm/CHANGES 27 Dec 2010 16:01:49 - 1.3501.2.27 +++ rpm/CHANGES 27 Dec 2010 22:05:45 - 1.3501.2.28 @@ -1,3 +1,5 @@ +5.4.0 -> 5.4.1: + 5.3.7 -> 5.4.0: - jbj: build: rescusictate the ISPRAS markup. - jbj: rpmlib: rescusictate the ISPRAS markup. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.3 -r2.472.2.4 configure.ac --- rpm/configure.ac 25 Dec 2010 18:02:27 - 2.472.2.3 +++ rpm/configure.ac 27 Dec 2010 22:05:45 - 2.472.2.4 @@ -8,7 +8,7 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.4.0],[PACKAGE_BUGREPORT_DEFAULT]) +AC_INIT([rpm],[5.4.1],[PACKAGE_BUGREPORT_DEFAULT]) PACKAGE_TIMESTAMP="2010-12-06" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 25-Dec-2010 19:02:28 Branch: rpm-5_4 Handle: 2010122518022601 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - distcheck: make internal neon "opt-in", avoid GSS-API wrestling. Summary: RevisionChanges Path 1.3501.2.18 +1 -0 rpm/CHANGES 2.472.2.3 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.17 -r1.3501.2.18 CHANGES --- rpm/CHANGES 24 Dec 2010 19:56:50 - 1.3501.2.17 +++ rpm/CHANGES 25 Dec 2010 18:02:26 - 1.3501.2.18 @@ -1,4 +1,5 @@ 5.3.7 -> 5.4.0: +- jbj: distcheck: make internal neon "opt-in", avoid GSS-API wrestling. - jbj: verify: fix: NULL fnpyKey caused doubled parentdir/linkto check. - jbj: rpmal: add common exit point to control flow. - jbj: rpmdb: use Depchache store by default again. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.472.2.2 -r2.472.2.3 configure.ac --- rpm/configure.ac 23 Dec 2010 15:49:06 - 2.472.2.2 +++ rpm/configure.ac 25 Dec 2010 18:02:27 - 2.472.2.3 @@ -1371,7 +1371,7 @@ RPM_CHECK_LIB( [Neon], [neon], [neon], [ne_session_create], [ne_session.h], -[yes,internal:external:none], [neon:src:src], +[no,internal:external:none], [neon:src:src], [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
