RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: beecrypt popt lua rpm Date: 23-Dec-2016 18:00:02
Branch: HEAD rpm-5_4 Handle: 2016122317000101
Modified files:
popt popt.c
Modified files: (Branch: rpm-5_4)
beecrypt/include/beecrypt
api.h mpopt.h
lua/local lposix.c
rpm/doc .cvsignore
rpm/m4 .cvsignore
rpm/rpmdb rpmtag.h
rpm/rpmio Makefile.am librpmio.vers rpmmqtt.c tgit.c
rpm/scripts rpm.pc.in
rpm/tools rpmfind.c
Log:
- sanity.
Summary:
Revision Changes Path
1.1.1.1.4.1 +1 -1 beecrypt/include/beecrypt/api.h
1.1.1.1.4.1 +1 -1 beecrypt/include/beecrypt/mpopt.h
1.14.4.12 +2 -0 lua/local/lposix.c
1.167 +13 -0 popt/popt.c
1.1.32.1 +1 -0 rpm/doc/.cvsignore
1.1.8.4 +23 -73 rpm/m4/.cvsignore
1.70.4.23 +2 -2 rpm/rpmdb/rpmtag.h
1.293.2.77 +2 -1 rpm/rpmio/Makefile.am
2.199.2.64 +1 -0 rpm/rpmio/librpmio.vers
1.1.2.27 +18 -2 rpm/rpmio/rpmmqtt.c
1.1.2.51 +1 -1 rpm/rpmio/tgit.c
1.3.10.1 +2 -2 rpm/scripts/rpm.pc.in
2.15.2.10 +2 -0 rpm/tools/rpmfind.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: beecrypt/include/beecrypt/api.h
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.1.1.1.4.1 api.h
--- beecrypt/include/beecrypt/api.h 29 Apr 2010 16:54:26 -0000 1.1.1.1
+++ beecrypt/include/beecrypt/api.h 23 Dec 2016 17:00:01 -0000
1.1.1.1.4.1
@@ -30,7 +30,7 @@
#endif
#if WIN32
-# if !__CYGWIN32__ && !__MINGW32__
+# if !__CYGWIN32__ && !__MINGW32__ && !__CYGWIN__
# include "beecrypt/win.h"
# else
# include "beecrypt/gnu.h"
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/include/beecrypt/mpopt.h
============================================================================
$ cvs diff -u -r1.1.1.1 -r1.1.1.1.4.1 mpopt.h
--- beecrypt/include/beecrypt/mpopt.h 29 Apr 2010 16:54:27 -0000 1.1.1.1
+++ beecrypt/include/beecrypt/mpopt.h 23 Dec 2016 17:00:01 -0000
1.1.1.1.4.1
@@ -121,7 +121,7 @@
# define ASM_MPSETMUL
# define ASM_MPADDMUL
# define ASM_MPADDSQRTRC
-# elif defined(OPTIMIZE_X86_64)
+# elif defined(OPTIMIZE_X86_64) && !defined(__CYGWIN__)
# define ASM_MPZERO
# define ASM_MPFILL
# define ASM_MPEVEN
@@ .
patch -p0 <<'@@ .'
Index: lua/local/lposix.c
============================================================================
$ cvs diff -u -r1.14.4.11 -r1.14.4.12 lposix.c
--- lua/local/lposix.c 5 May 2016 22:29:30 -0000 1.14.4.11
+++ lua/local/lposix.c 23 Dec 2016 17:00:01 -0000 1.14.4.12
@@ -4020,7 +4020,9 @@
#define MENTRY(_e) set_integer_const(LPOSIX_STR_1(LPOSIX_SPLICE(_SA, _e)),
LPOSIX_SPLICE(SA, _e))
MENTRY( _NOCLDSTOP );
#if _POSIX_VERSION >= 20112L
+#if defined(SA_NOCLDWAIT) /* XXX __CYGWIN__ hasn't */
MENTRY( _NOCLDWAIT );
+#endif
MENTRY( _RESETHAND );
MENTRY( _NODEFER );
#endif
@@ .
patch -p0 <<'@@ .'
Index: popt/popt.c
============================================================================
$ cvs diff -u -r1.166 -r1.167 popt.c
--- popt/popt.c 27 Jun 2016 03:00:40 -0000 1.166
+++ popt/popt.c 23 Dec 2016 17:00:01 -0000 1.167
@@ -1308,16 +1308,25 @@
switch (poptArgType(opt)) {
case POPT_ARG_BITSET:
+ /* XXX memory leak, application is responsible for free. */
rc = poptSaveBits(arg.ptr, opt->argInfo, con->os->nextArg);
+#if 0
con->os->nextArg = _free(con->os->nextArg);
+#endif
/*@switchbreak@*/ break;
case POPT_ARG_ARGV:
+ /* XXX memory leak, application is responsible for free. */
rc = poptSaveString(arg.ptr, opt->argInfo, con->os->nextArg);
+#if 0
con->os->nextArg = _free(con->os->nextArg);
+#endif
/*@switchbreak@*/ break;
case POPT_ARG_STRING:
+ /* XXX memory leak, application is responsible for free. */
arg.argv[0] = con->os->nextArg;
+#if 1
con->os->nextArg = NULL;
+#endif
/*@switchbreak@*/ break;
case POPT_ARG_LONGLONG:
@@ -1387,7 +1396,9 @@
arg.shortp[0] = (short) aNUM;
/*@innerbreak@*/ break;
}
+#if 0
con->os->nextArg = _free(con->os->nextArg);
+#endif
} /*@switchbreak@*/ break;
case POPT_ARG_FLOAT:
@@ -1429,7 +1440,9 @@
arg.floatp[0] = (float) aDouble;
/*@innerbreak@*/ break;
}
+#if 0
con->os->nextArg = _free(con->os->nextArg);
+#endif
} /*@switchbreak@*/ break;
case POPT_ARG_MAINCALL:
/*@-assignexpose -type@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/doc/.cvsignore
============================================================================
$ cvs diff -u -r1.1 -r1.1.32.1 .cvsignore
--- rpm/doc/.cvsignore 19 Jul 1999 22:13:12 -0000 1.1
+++ rpm/doc/.cvsignore 23 Dec 2016 17:00:01 -0000 1.1.32.1
@@ -1,2 +1,3 @@
Makefile
Makefile.in
+relocatable.texi
@@ .
patch -p0 <<'@@ .'
Index: rpm/m4/.cvsignore
============================================================================
$ cvs diff -u -r1.1.8.3 -r1.1.8.4 .cvsignore
--- rpm/m4/.cvsignore 19 Jun 2016 06:48:46 -0000 1.1.8.3
+++ rpm/m4/.cvsignore 23 Dec 2016 17:00:01 -0000 1.1.8.4
@@ -1,105 +1,53 @@
00gnulib.m4
absolute-header.m4
configmake.m4
-extensions.m4
-extern-inline.m4
gnulib-cache.m4
gnulib-common.m4
gnulib-comp.m4
gnulib-tool.m4
-include_next.m4
-inttypes.m4
-inttypes-pri.m4
-longlong.m4
msvc-inval.m4
msvc-nothrow.m4
-multiarch.m4
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
+relocatable-lib.m4
+ld-output-def.m4
+ld-version-script.m4
+include_next.m4
off_t.m4
ssize_t.m4
+sys_types_h.m4
+extensions.m4
+extern-inline.m4
+inttypes-pri.m4
+inttypes.m4
+longlong.m4
+multiarch.m4
stdalign.m4
stdbool.m4
stddef_h.m4
stdint.m4
stdlib_h.m4
-sys_types_h.m4
unistd_h.m4
warn-on-use.m4
wchar_h.m4
wchar_t.m4
wint_t.m4
-libtool.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
-relocatable-lib.m4
-ld-output-def.m4
-ld-version-script.m4
-alloca.m4
-arpa_inet_h.m4
-assert_h.m4
-close.m4
-ctype.m4
-dirent_h.m4
-dup2.m4
-eealloc.m4
-environ.m4
-errno_h.m4
-fcntl_h.m4
-fdopen.m4
-fstat.m4
-getcwd.m4
-getdtablesize.m4
-getopt.m4
-gettimeofday.m4
-largefile.m4
-locale_h.m4
-lstat.m4
-malloc.m4
-malloca.m4
-mode_t.m4
-netdb_h.m4
-netinet_in_h.m4
-nocrash.m4
-open.m4
-pathmax.m4
-putenv.m4
-realloc.m4
-secure_getenv.m4
-setenv.m4
-signal_h.m4
-socklen.m4
-sockpfaf.m4
-stat.m4
-stdio_h.m4
-stpcpy.m4
-stpncpy.m4
-string_h.m4
-symlink.m4
-sys_socket_h.m4
-sys_stat_h.m4
-sys_time_h.m4
-sys_uio_h.m4
-sys_utsname_h.m4
-sys_wait_h.m4
-time_h.m4
dup.m4
-fclose.m4
fcntl.m4
-fflush.m4
flock.m4
-fpurge.m4
-freading.m4
-fseek.m4
-fseeko.m4
fsync.m4
-ftell.m4
-ftello.m4
ftruncate.m4
gethostname.m4
inet_pton.m4
ioctl.m4
isatty.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+lock.m4
lseek.m4
perror.m4
pipe.m4
@@ -118,6 +66,8 @@
sys_ioctl_h.m4
sys_select_h.m4
thread.m4
-ungetc.m4
+threadlib.m4
write.m4
yield.m4
+isblank.m4
+limits-h.m4
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtag.h
============================================================================
$ cvs diff -u -r1.70.4.22 -r1.70.4.23 rpmtag.h
--- rpm/rpmdb/rpmtag.h 25 Jun 2016 08:32:00 -0000 1.70.4.22
+++ rpm/rpmdb/rpmtag.h 23 Dec 2016 17:00:01 -0000 1.70.4.23
@@ -28,8 +28,8 @@
* The basic types of data in tags from headers.
*/
enum rpmTagType_e {
- /* RPM_NULL_TYPE = 0 - never been used. */
- /* rpm_CHAR_TYPE = 1 - never been used in *.rpm ==> RPM_UINT8_TYPE.
*/
+ /* _RPM_NULL_TYPE = 0 - never been used. */
+ /* _RPM_CHAR_TYPE = 1 - never been used in *.rpm ==> RPM_UINT8_TYPE.
*/
RPM_UINT8_TYPE = 2,
RPM_UINT16_TYPE = 3,
RPM_UINT32_TYPE = 4,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.293.2.76 -r1.293.2.77 Makefile.am
--- rpm/rpmio/Makefile.am 16 Jul 2016 14:38:11 -0000 1.293.2.76
+++ rpm/rpmio/Makefile.am 23 Dec 2016 17:00:02 -0000 1.293.2.77
@@ -269,7 +269,8 @@
endif
# XXX FIXME: error: inlining failed in call to always_inline â__signbitâ
-librpmio_la_LIBADD = duktape.o -lm
+librpmio_la_LIBADD =
+#librpmio_la_LIBADD += duktape.o -lm
if ENABLE_BUILD_INTLIBDEP
librpmio_la_LIBADD += \
$(top_builddir)/misc/librpmmisc.la
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.199.2.63 -r2.199.2.64 librpmio.vers
--- rpm/rpmio/librpmio.vers 7 Jul 2016 12:17:31 -0000 2.199.2.63
+++ rpm/rpmio/librpmio.vers 23 Dec 2016 17:00:02 -0000 2.199.2.64
@@ -1,6 +1,7 @@
LIBRPMIO_0
{
global:
+ atexit;
__assert_program_name;
Access;
_Access;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmqtt.c
============================================================================
$ cvs diff -u -r1.1.2.26 -r1.1.2.27 rpmmqtt.c
--- rpm/rpmio/rpmmqtt.c 16 Jul 2016 14:41:28 -0000 1.1.2.26
+++ rpm/rpmio/rpmmqtt.c 23 Dec 2016 17:00:02 -0000 1.1.2.27
@@ -35,7 +35,9 @@
#ifdef WITH_PROTON
#include <proton/message.h>
#include <proton/messenger.h>
-#include
"/usr/share/proton-0.12.1/examples/c/include/pncompat/misc_funcs.inc"
+#ifdef DYING
+#include
"/usr/share/proton-0.14.0/examples/c/include/pncompat/misc_funcs.inc"
+#endif
#endif
#ifdef WITH_ZEROMQ
#include <zmq.h>
@@ -46,6 +48,16 @@
#include "debug.h"
+#if 0
+int atexit(void (*function)(void))
+{
+#if 0
+ fprintf(stderr, "*** %s(%p)\n", __FUNCTION__, function);
+#endif
+ return 0;
+}
+#endif
+
int _rpmmqtt_debug;
#define F_ISSET(_f, _FLAG) (((_f) & ((MQTT_FLAGS_##_FLAG) & ~0x40000000)) !=
MQTT_FLAGS_NONE)
@@ -2551,6 +2563,7 @@
_properties = &props;
#endif
+if (rpmIsDebug())
fprintf(stderr, "*** %s: %s mqtt host %s topic %s\n", __FUNCTION__, topic,
mqtt->host, mqtt->topic);
rc = mqchk(mqtt, "basic_publish",
amqp_basic_publish(mqtt->I,
@@ -2582,6 +2595,7 @@
if (!rpmmqttConnect(mqtt)) {
int _lvl = RPMLOG_DEBUG;
+if (rpmIsDebug())
fprintf(stderr, "XXX %s: FIXME\n", __FUNCTION__);
rpmlog(_lvl, "%19s: %s qos(%d)\n", "subscribe", topic, qos);
@@ -2702,6 +2716,7 @@
if (!rpmmqttConnect(mqtt)) {
int _lvl = RPMLOG_DEBUG;
+if (rpmIsDebug())
fprintf(stderr, "XXX %s: FIXME\n", __FUNCTION__);
rpmlog(_lvl, "%19s: %s\n", "unsubscribe", topic);
@@ -4097,7 +4112,8 @@
{
rc = rpmmqttCreate(mqtt);
-if (rc) fprintf(stderr, "*** %s:%u rc %d\n", __FUNCTION__, __LINE__, rc);
+if (rc)
+fprintf(stderr, "*** %s:%u rc %d\n", __FUNCTION__, __LINE__, rc);
/* Prepare for subscription delivery. */
if (MF_ISSET(BUFFER) && mqtt->iob == NULL)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tgit.c
============================================================================
$ cvs diff -u -r1.1.2.50 -r1.1.2.51 tgit.c
--- rpm/rpmio/tgit.c 19 Apr 2016 13:00:10 -0000 1.1.2.50
+++ rpm/rpmio/tgit.c 23 Dec 2016 17:00:02 -0000 1.1.2.51
@@ -3753,7 +3753,7 @@
callbacks.credentials = cred_acquire_cb;
xx = chkgit(git, "git_remote_connect",
git_remote_connect(remote, GIT_DIRECTION_FETCH,
- &callbacks, NULL));
+ &callbacks, NULL, NULL));
if (xx < 0)
goto exit;
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/rpm.pc.in
============================================================================
$ cvs diff -u -r1.3 -r1.3.10.1 rpm.pc.in
--- rpm/scripts/rpm.pc.in 22 Jul 2007 10:56:50 -0000 1.3
+++ rpm/scripts/rpm.pc.in 23 Dec 2016 17:00:02 -0000 1.3.10.1
@@ -5,14 +5,14 @@
suffix=@WITH_PATH_VERSIONED_SUFFIX@
prefix=@prefix@
exec_prefix=@exec_prefix@
-includedir=@includedir@${suffix}
+includedir=@includedir@/rpm${suffix}
libdir=@libdir@
Name: @PACKAGE_NAME@
Description: RPM Package Manager
Version: @PACKAGE_VERSION@
URL: http://rpm5.org/
-Cflags: -I${includedir}/rpm
+Cflags: -I${includedir}
Libs: -L${libdir} -lrpmbuild${suffix} -lrpm${suffix} -lrpmdb${suffix}
-lrpmio${suffix} -lrpmconstant${suffix} -lrpmmisc${suffix}
Libs.private: @LDFLAGS@ @LIBS@
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmfind.c
============================================================================
$ cvs diff -u -r2.15.2.9 -r2.15.2.10 rpmfind.c
--- rpm/tools/rpmfind.c 17 Jun 2016 08:07:28 -0000 2.15.2.9
+++ rpm/tools/rpmfind.c 23 Dec 2016 17:00:02 -0000 2.15.2.10
@@ -65,7 +65,9 @@
#include "debug.h"
+#if !defined(__unused) /* XXX CYGWIN defines in <sys/cdefs.h>
*/
#define __unused __attribute__((unused))
+#endif
time_t now; /* time find was run */
int dotfd; /* starting directory */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
