[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 11:46:38
Branch: HEAD Handle: 2007062410463800
Modified files:
rpm configure.ac
Log:
the hash character of #include really has to be in column 0 or some
pre-processors fail (the 'include' part of '#include' can be indented
but not the '#' part)
Summary:
RevisionChanges Path
2.108 +3 -2 rpm/configure.ac
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.107 -r2.108 configure.ac
--- rpm/configure.ac 22 Jun 2007 20:11:03 - 2.107
+++ rpm/configure.ac 24 Jun 2007 09:46:38 - 2.108
@@ -70,8 +70,9 @@
dnl also just to be sure.
AC_MSG_CHECKING(whether va_list assignments need array notation)
AC_CACHE_VAL(ac_cv_valistisarray,
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include stdlib.h
- #include stdarg.h
+ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
+#include stdlib.h
+#include stdarg.h
void foo(int i, ...) {
va_list ap1, ap2;
va_start(ap1, i);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ acinclude.m4
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 11:53:57
Branch: HEAD Handle: 2007062410535700
Modified files:
rpm acinclude.m4
Log:
fix indent
Summary:
RevisionChanges Path
2.6 +2 -2 rpm/acinclude.m4
patch -p0 '@@ .'
Index: rpm/acinclude.m4
$ cvs diff -u -r2.5 -r2.6 acinclude.m4
--- rpm/acinclude.m4 24 Jun 2007 09:53:33 - 2.5
+++ rpm/acinclude.m4 24 Jun 2007 09:53:57 - 2.6
@@ -154,7 +154,7 @@
dnl # detection of library in arbitrary external location
__rcl_$2_version=`($2-config --version) 2/dev/null`
if test .${__rcl_$2_version} != .; then
-dnl # via config script in PATH
+dnl # via config script in PATH
__rcl_flags=`($2-config --cppflags) 2/dev/null`;
if test .${__rcl_flags} != .; then CPPFLAGS=${CPPFLAGS} ${__rcl_flags}; fi
__rcl_flags=`($2-config --cflags ) 2/dev/null`;
if test .${__rcl_flags} != .; then CFLAGS=${CFLAGS} ${__rcl_flags}; fi
__rcl_flags=`($2-config --ldflags ) 2/dev/null`;
if test .${__rcl_flags} != .; then LDFLAGS=${LDFLAGS} ${__rcl_flags}; fi
@@ -162,7 +162,7 @@
__rcl_result_hint=external: via $2-config
break
elif (pkg-config --exists $2) 2/dev/null; then
-dnl # via pkg-config(1) script in PATH
+dnl # via pkg-config(1) script in PATH
CPPFLAGS=${CPPFLAGS} `pkg-config $2
--cflags-only-I`
CFLAGS=${CFLAGS} `pkg-config $2
--cflags-only-other`
LDFLAGS=${LDFLAGS} `pkg-config $2
--libs-only-other`
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/rpmio/ md2.c md2.h md4.c md4.h rmd128...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 12:27:23
Branch: HEAD Handle: 2007062411272001
Modified files:
rpm configure.ac
rpm/rpmio md2.c md2.h md4.c md4.h rmd128.c rmd128.h rmd160.c
rmd160.h rmd256.c rmd256.h rmd320.c rmd320.h
rpmio_internal.h salsa10.c salsa10.h salsa20.c
salsa20.h sha224.c sha224.h tax.c tiger.c tiger.h
tinv.c
Log:
Untwist building against BeeCrypt: we cannot portably check for
beecrypt/foo.h and then just use foo.h. Especially, because
BeeCrypt's headers include their siblings via beecrypt/foo.h, too! So,
already because of beecrypt's own sibling inclusion, the only correct
BeeCrypt usage is to use beecrypt/foo.h consistently: both during
configure-time and build-time.
Summary:
RevisionChanges Path
2.110 +1 -2 rpm/configure.ac
1.3 +2 -2 rpm/rpmio/md2.c
1.3 +1 -1 rpm/rpmio/md2.h
1.3 +2 -2 rpm/rpmio/md4.c
1.3 +1 -1 rpm/rpmio/md4.h
1.3 +2 -2 rpm/rpmio/rmd128.c
1.3 +1 -1 rpm/rpmio/rmd128.h
1.3 +2 -2 rpm/rpmio/rmd160.c
1.3 +1 -1 rpm/rpmio/rmd160.h
1.3 +2 -2 rpm/rpmio/rmd256.c
1.3 +1 -1 rpm/rpmio/rmd256.h
1.3 +2 -2 rpm/rpmio/rmd320.c
1.3 +1 -1 rpm/rpmio/rmd320.h
2.75+13 -17 rpm/rpmio/rpmio_internal.h
1.3 +2 -2 rpm/rpmio/salsa10.c
1.3 +1 -1 rpm/rpmio/salsa10.h
1.3 +2 -2 rpm/rpmio/salsa20.c
1.3 +1 -1 rpm/rpmio/salsa20.h
1.3 +2 -2 rpm/rpmio/sha224.c
1.3 +1 -1 rpm/rpmio/sha224.h
2.2 +3 -3 rpm/rpmio/tax.c
1.3 +2 -2 rpm/rpmio/tiger.c
1.3 +1 -1 rpm/rpmio/tiger.h
1.7 +2 -2 rpm/rpmio/tinv.c
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.109 -r2.110 configure.ac
--- rpm/configure.ac 24 Jun 2007 09:48:23 - 2.109
+++ rpm/configure.ac 24 Jun 2007 10:27:20 - 2.110
@@ -536,8 +536,7 @@
RPM_CHECK_LIB([BeeCrypt], [beecrypt],
[beecrypt], [mpfprintln], [beecrypt/api.h],
[yes,external], [beecrypt],
- [ CPPFLAGS=${CPPFLAGS} -I${prefix}/include/beecrypt
- ], [ AC_ERROR([mandatory BeeCrypt library not found]) ])
+ [], [ AC_ERROR([mandatory BeeCrypt library not found]) ])
#=
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/md2.c
$ cvs diff -u -r1.2 -r1.3 md2.c
--- rpm/rpmio/md2.c 25 May 2007 18:34:14 - 1.2
+++ rpm/rpmio/md2.c 24 Jun 2007 10:27:21 - 1.3
@@ -12,8 +12,8 @@
#include system.h
#include md2.h
-#include mp.h
-#include endianness.h
+#include beecrypt/mp.h
+#include beecrypt/endianness.h
#include debug.h
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/md2.h
$ cvs diff -u -r1.2 -r1.3 md2.h
--- rpm/rpmio/md2.h 25 May 2007 18:34:14 - 1.2
+++ rpm/rpmio/md2.h 24 Jun 2007 10:27:21 - 1.3
@@ -6,7 +6,7 @@
#ifndef _MD2_H
#define _MD2_H
-#include beecrypt.h
+#include beecrypt/beecrypt.h
/*!\brief Holds all the parameters necessary for the MD2 algorithm.
* \ingroup HASH_md2_h
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/md4.c
$ cvs diff -u -r1.2 -r1.3 md4.c
--- rpm/rpmio/md4.c 25 May 2007 18:34:14 - 1.2
+++ rpm/rpmio/md4.c 24 Jun 2007 10:27:21 - 1.3
@@ -15,8 +15,8 @@
#endif
#include md4.h
-#include mp.h
-#include endianness.h
+#include beecrypt/mp.h
+#include beecrypt/endianness.h
#include debug.h
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/md4.h
$ cvs diff -u -r1.2 -r1.3 md4.h
--- rpm/rpmio/md4.h 25 May 2007 18:34:14 - 1.2
+++ rpm/rpmio/md4.h 24 Jun 2007 10:27:21 - 1.3
@@ -6,7 +6,7 @@
#ifndef _MD4_H
#define _MD4_H
-#include beecrypt.h
+#include
[CVS] RPM: rpm/rpmio/ rpmpgp.c tinv.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 12:37:59
Branch: HEAD Handle: 2007062411375900
Modified files:
rpm/rpmio rpmpgp.c tinv.c
Log:
Do not hard-code BeeCrypt version number, use the capitalization the
upstream vendor uses, align the ASCII armor output with the Version
headers of PGP 6.5.8 (which uses e.g. Version: PGP 6.5.8) and GnuPG
1.4.7 (which uses e.g. Version: GnuPG v1.4.7 (FreeBSD)) by using
Version: RPM 5.0 (BeeCrypt).
Summary:
RevisionChanges Path
2.52+2 -2 rpm/rpmio/rpmpgp.c
1.8 +1 -1 rpm/rpmio/tinv.c
patch -p0 '@@ .'
Index: rpm/rpmio/rpmpgp.c
$ cvs diff -u -r2.51 -r2.52 rpmpgp.c
--- rpm/rpmio/rpmpgp.c17 Jun 2007 14:49:02 - 2.51
+++ rpm/rpmio/rpmpgp.c24 Jun 2007 10:37:59 - 2.52
@@ -1468,9 +1468,9 @@
t = stpcpy(t, -BEGIN PGP );
t = stpcpy(t, pgpValStr(pgpArmorTbl, atype));
/[EMAIL PROTECTED]@*/
-t = stpcpy( stpcpy(t, -\nVersion: rpm-), VERSION);
+t = stpcpy( stpcpy(t, -\nVersion: RPM ), VERSION);
/[EMAIL PROTECTED]@*/
-t = stpcpy(t, (beecrypt-4.1.2)\n\n);
+t = stpcpy(t, (BeeCrypt)\n\n);
if ((enc = b64encode(s, ns)) != NULL) {
t = stpcpy(t, enc);
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/tinv.c
$ cvs diff -u -r1.7 -r1.8 tinv.c
--- rpm/rpmio/tinv.c 24 Jun 2007 10:27:21 - 1.7
+++ rpm/rpmio/tinv.c 24 Jun 2007 10:37:59 - 1.8
@@ -494,7 +494,7 @@
fprintf(stderr, -- %d\n,
i);
rc = Xmpbinv_w(q, s.size, s.data, qtemp, qwksp);
- fprintf(stderr, beecrypt: ); mpfprintln(stderr, qsize, qtemp);
+ fprintf(stderr, BeeCrypt: ); mpfprintln(stderr, qsize, qtemp);
fprintf(stderr, -- %d\n,
i);
rc = Ympbinv_w(q, s.size, s.data, qtemp, qwksp);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ acinclude.m4
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 13:59:03
Branch: HEAD Handle: 2007062412590200
Modified files:
rpm acinclude.m4
Log:
In preparation of adding granular verbose messages, use two M4 macros to
generate the foo-config and pkg-config foo related code.
Summary:
RevisionChanges Path
2.8 +30 -20 rpm/acinclude.m4
patch -p0 '@@ .'
Index: rpm/acinclude.m4
$ cvs diff -u -r2.7 -r2.8 acinclude.m4
--- rpm/acinclude.m4 24 Jun 2007 09:54:50 - 2.7
+++ rpm/acinclude.m4 24 Jun 2007 11:59:02 - 2.8
@@ -152,21 +152,32 @@
])
elif test .${__rcl_location} = .external; then
dnl # detection of library in arbitrary external location
-__rcl_$2_version=`($2-config --version) 2/dev/null`
-if test .${__rcl_$2_version} != .; then
+if test .`($2-config --version) 2/dev/null` != .; then
dnl # via config script in PATH
-__rcl_flags=`($2-config --cppflags) 2/dev/null`;
if test .${__rcl_flags} != .; then CPPFLAGS=${CPPFLAGS} ${__rcl_flags}; fi
-__rcl_flags=`($2-config --cflags ) 2/dev/null`;
if test .${__rcl_flags} != .; then CFLAGS=${CFLAGS} ${__rcl_flags}; fi
-__rcl_flags=`($2-config --ldflags ) 2/dev/null`;
if test .${__rcl_flags} != .; then LDFLAGS=${LDFLAGS} ${__rcl_flags}; fi
-__rcl_flags=`($2-config --libs) 2/dev/null`;
if test .${__rcl_flags} != .; then LIBS=${LIBS} ${__rcl_flags}; fi
+m4_define([__rcl_query_config], [
+__rcl_flags=`($][1 --$][2) 2/dev/null`
+if test .${__rcl_flags} != .; then
+$][3=${$][3} ${__rcl_flags}
+fi
+])
+__rcl_query_config([$2-config], [cppflags],
[CPPFLAGS])
+__rcl_query_config([$2-config], [cflags], [CFLAGS])
+__rcl_query_config([$2-config], [ldflags],
[LDFLAGS])
+__rcl_query_config([$2-config], [libs], [LIBS])
__rcl_result_hint=external: via $2-config
break
elif (pkg-config --exists $2) 2/dev/null; then
dnl # via pkg-config(1) script in PATH
-CPPFLAGS=${CPPFLAGS} `pkg-config $2
--cflags-only-I`
-CFLAGS=${CFLAGS} `pkg-config $2
--cflags-only-other`
-LDFLAGS=${LDFLAGS} `pkg-config $2
--libs-only-other`
-LIBS=${LDFLAGS} `pkg-config $2 --libs-only-l`
+m4_define([__rcl_query_pkgconfig], [
+__rcl_flags=`($][1 --$][2) 2/dev/null`
+if test .${__rcl_flags} != .; then
+$][3=${$][3} ${__rcl_flags}
+fi
+])
+__rcl_query_pkgconfig([pkg-config $2],
[cflags-only-I], [CPPFLAGS])
+__rcl_query_pkgconfig([pkg-config $2],
[cflags-only-other], [CFLAGS])
+__rcl_query_pkgconfig([pkg-config $2],
[libs-only-other], [LDFLAGS])
+__rcl_query_pkgconfig([pkg-config $2],
[libs-only-l], [LIBS])
__rcl_result_hint=external: via pkg-config $2
break
elif test .${__rcl_found} = .no; then
@@ -192,12 +203,11 @@
dnl # via config script
for __rcl_dir in ${__rcl_location}/bin
${__rcl_location}; do
if test -f ${__rcl_dir}/$2-config test ! -f
${__rcl_dir}/$2-config.in; then
-__rcl_$2_version=`(${__rcl_dir}/$2-config
--version) 2/dev/null`
-if test .${__rcl_$2_version} != .; then
-__rcl_flags=`(${__rcl_dir}/$2-config
--cppflags) 2/dev/null`; if test .${__rcl_flags} != .; then
CPPFLAGS=${CPPFLAGS} ${__rcl_flags}; fi
-__rcl_flags=`(${__rcl_dir}/$2-config
--cflags ) 2/dev/null`; if test .${__rcl_flags} != .; then
CFLAGS=${CFLAGS}
[CVS] RPM: rpm/ CHANGES acinclude.m4 configure.ac rpm/rpmio/ rpmlog.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 24-Jun-2007 20:32:04
Branch: HEAD Handle: 2007062419320301
Modified files:
rpm CHANGES acinclude.m4 configure.ac
rpm/rpmio rpmlog.c
Log:
Replace also in RPM (similar to what we already have in POPT) the too
weak Autoconf glue for C99 va_copy(3) with a more sophisticated solution
which is able to provide more fallbacks and also tries them out in
sequence before using them. Also, it provides seamless use of just
va_copy as it provides its results directly via config.h.
Summary:
RevisionChanges Path
1.1392 +1 -0 rpm/CHANGES
2.10+117 -0 rpm/acinclude.m4
2.115 +1 -27 rpm/configure.ac
2.31+0 -12 rpm/rpmio/rpmlog.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1391 -r1.1392 CHANGES
--- rpm/CHANGES 22 Jun 2007 12:58:11 - 1.1391
+++ rpm/CHANGES 24 Jun 2007 18:32:03 - 1.1392
@@ -1,4 +1,5 @@
4.5 - 5.0:
+- rse: replace too weak Autoconf glue for C99 va_copy(3) with a more
sophisticated solution
- jbj: add patch macro, renamed to Xpatch until fully wired.
- jbj: remove support for patch-2.1.
- rse: allow actually used tar(1) and patch(1) tools to be set via
%__tar and %__patch
@@ .
patch -p0 '@@ .'
Index: rpm/acinclude.m4
$ cvs diff -u -r2.9 -r2.10 acinclude.m4
--- rpm/acinclude.m4 24 Jun 2007 12:22:05 - 2.9
+++ rpm/acinclude.m4 24 Jun 2007 18:32:03 - 2.10
@@ -411,3 +411,120 @@
${as_unset} RPM_CHECK_LIB_LOCATION
])
+dnl ##
+dnl ## NAME:
+dnl ##AC_CHECK_VA_COPY -- Check for C99 va_copy
+dnl ##
+dnl ## COPYRIGHT
+dnl ##Copyright (c) 2006 Ralf S. Engelschall [EMAIL PROTECTED]
+dnl ##
+dnl ## DESCRIPTION:
+dnl ##This macro checks for C99 va_copy() implementation and
+dnl ##provides fallback implementation if neccessary. Notice: this
+dnl ##check is rather complex because first because we really have
+dnl ##to try various possible implementations in sequence and
+dnl ##second, we cannot define a macro in config.h with parameters
+dnl ##directly.
+dnl ##
+dnl ## USAGE:
+dnl ##configure.in:
+dnl ## AC_CHECK_VA_COPY
+dnl ##foo.c:
+dnl ## #include config.h
+dnl ## [...]
+dnl ## va_copy(d,s)
+dnl ##
+
+dnl # test program for va_copy() implementation
+changequote(,)
+m4_define(__va_copy_test, [
+#include stdlib.h
+#include stdarg.h
+#include string.h
+#define DO_VA_COPY(d, s) $1
+void test(char *str, ...)
+{
+va_list ap, ap2;
+int i;
+va_start(ap, str);
+DO_VA_COPY(ap2, ap);
+for (i = 1; i = 9; i++) {
+int k = (int)va_arg(ap, int);
+if (k != i)
+abort();
+}
+DO_VA_COPY(ap, ap2);
+for (i = 1; i = 9; i++) {
+int k = (int)va_arg(ap, int);
+if (k != i)
+abort();
+}
+va_end(ap);
+}
+int main(int argc, char *argv[])
+{
+test(test, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+exit(0);
+}
+])
+changequote([,])
+
+dnl # test driver for va_copy() implementation
+m4_define(__va_copy_check, [
+AH_VERBATIM($1,
+[/* Predefined possible va_copy() implementation (id: $1) */
+#define __VA_COPY_USE_$1(d, s) $2])
+if test .$ac_cv_va_copy = .; then
+AC_TRY_RUN(__va_copy_test($2), [ac_cv_va_copy=$1])
+fi
+])
+
+dnl # Autoconf check for va_copy() implementation checking
+AC_DEFUN([AC_CHECK_VA_COPY],[
+ dnl # provide Autoconf display check message
+ AC_MSG_CHECKING(for va_copy() function)
+ dnl # check for various implementations in priorized sequence
+ AC_CACHE_VAL(ac_cv_va_copy, [
+ac_cv_va_copy=
+dnl # 1. check for standardized C99 macro
+__va_copy_check(C99, [va_copy((d), (s))])
+dnl # 2. check for alternative/deprecated GCC macro
+__va_copy_check(GCM, [VA_COPY((d), (s))])
+dnl # 3. check for internal GCC macro (high-level define)
+__va_copy_check(GCH, [__va_copy((d), (s))])
+dnl # 4. check for internal GCC macro (built-in function)
+__va_copy_check(GCB, [__builtin_va_copy((d), (s))])
+dnl # 5. check for assignment approach (assuming va_list is a struct)
+__va_copy_check(ASS, [do {
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 24-Jun-2007 22:39:09 Branch: HEAD Handle: 2007062421390800 Modified files: rpm Makefile.am Log: cleanup some parts of this Automake template Summary: RevisionChanges Path 2.174 +5 -3 rpm/Makefile.am patch -p0 '@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.173 -r2.174 Makefile.am --- rpm/Makefile.am 24 Jun 2007 18:12:30 - 2.173 +++ rpm/Makefile.am 24 Jun 2007 20:39:08 - 2.174 @@ -32,7 +32,8 @@ rpmdb \ lib \ build \ - @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ \ + @WITH_PYTHON_SUBDIR@ \ + @WITH_PERL_SUBDIR@ \ tools \ scripts \ doc \ @@ -51,6 +52,7 @@ myLDFLAGS = @WITH_LIBELF_LIB@ myLDADD = \ + $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ $(top_builddir)/rpmio/librpmio.la @@ -65,13 +67,13 @@ rpm_SOURCES =$(top_srcdir)/build.c rpm_LDFLAGS =$(myLDFLAGS) $(staticLDFLAGS) -rpm_LDADD = rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD) +rpm_LDADD = rpm.o $(myLDADD) rpm.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $ rpmbuild_SOURCES = $(top_srcdir)/build.c rpmbuild_LDFLAGS = $(myLDFLAGS) $(staticLDFLAGS) -rpmbuild_LDADD = rpmbuild.o $(top_builddir)/build/librpmbuild.la $(myLDADD) +rpmbuild_LDADD = rpmbuild.o $(myLDADD) rpmbuild.o: $(top_srcdir)/rpmqv.c $(COMPILE) -DIAM_RPMBT -o $@ -c $ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
