[CVS] RPM: neon/src/ Makefile.am

2013-08-19 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: neon Date:   20-Aug-2013 07:53:55
  Branch: HEAD Handle: 2013082005535400

  Modified files:
neon/srcMakefile.am

  Log:
- neon: add ssl on Mac OS X.

  Summary:
RevisionChanges Path
1.2 +9  -1  neon/src/Makefile.am
  

  patch -p0 <<'@@ .'
  Index: neon/src/Makefile.am
  
  $ cvs diff -u -r1.1 -r1.2 Makefile.am
  --- neon/src/Makefile.am  23 Aug 2010 16:44:05 -  1.1
  +++ neon/src/Makefile.am  20 Aug 2013 05:53:54 -  1.2
  @@ -12,7 +12,13 @@
   
   AM_CFLAGS = # $(OPENMP_CFLAGS)
   
  -EXTRA_DIST = 
  +EXTRA_DIST = \
  + ne_acl3744.c \
  + ne_gnutls.c \
  + ne_oldacl.c \
  + ne_openssl.c \
  + ne_sspi.c \
  + ne_stubssl.c
   
   EXTRA_PROGRAMS =
   
  @@ -72,6 +78,8 @@
ne_utils.c \
ne_xml.c \
ne_xmlreq.c
  +libneon_la_DEPENDENCIES = @NEON_EXTRAOBJS@
  +libneon_la_LIBADD = @NEON_EXTRAOBJS@ @NEON_LIBS@
   
   libneon_la_LDFLAGS = # -release $(LT_CURRENT).$(LT_REVISION)
   #if HAVE_LD_VERSION_SCRIPT
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: neon/test/ Makefile.am largefile.c

2013-08-19 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: neon Date:   20-Aug-2013 07:51:17
  Branch: HEAD Handle: 2013082005511700

  Modified files:
neon/test   Makefile.am largefile.c

  Log:
- neon: tests "make check" compiles on Mac OS X

  Summary:
RevisionChanges Path
1.4 +4  -8  neon/test/Makefile.am
1.3 +7  -0  neon/test/largefile.c
  

  patch -p0 <<'@@ .'
  Index: neon/test/Makefile.am
  
  $ cvs diff -u -r1.3 -r1.4 Makefile.am
  --- neon/test/Makefile.am 4 Aug 2013 21:05:06 -   1.3
  +++ neon/test/Makefile.am 20 Aug 2013 05:51:17 -  1.4
  @@ -117,11 +117,11 @@
 $(SHELL) makekeys $(srcdir) 2>makekeys.out
@echo timestamp > ca-stamp
   
  -Makefile: $(srcdir)/Makefile.in
  - cd .. && ./config.status test/Makefile
  +##J Makefile: $(srcdir)/Makefile.in
  +##J  cd .. && ./config.status test/Makefile
   
  -makekeys: $(srcdir)/makekeys.sh
  - cd .. && ./config.status test/makekeys
  +##J makekeys: $(srcdir)/makekeys.sh
  +##J  cd .. && ./config.status test/makekeys
   
   noinst_PROGRAMS = \
socket-ssl \
  @@ -132,9 +132,7 @@
util-tests \
string-tests \
socket \
  - server \
request \
  - regress \
compress \
oldacl \
acl3744 \
  @@ -164,9 +162,7 @@
   util_tests_LDADD =   $(LDADD)
   string_tests_LDADD = $(LDADD)
   socket_LDADD =   $(LDADD)
  -server_LDADD =   $(LDADD)
   request_LDADD =  $(LDADD)
  -regress_LDADD =  $(LDADD)
   compress_LDADD = $(LDADD)
   oldacl_LDADD =   $(LDADD)
   acl3744_LDADD =  $(LDADD)
  @@ .
  patch -p0 <<'@@ .'
  Index: neon/test/largefile.c
  
  $ cvs diff -u -r1.2 -r1.3 largefile.c
  --- neon/test/largefile.c 6 May 2010 19:28:01 -   1.2
  +++ neon/test/largefile.c 20 Aug 2013 05:51:17 -  1.3
  @@ -39,6 +39,13 @@
   #define INT64_C(x) x ## LL
   #endif
   
  +#if defined(__APPLE__)
  +typedef  __darwin_off_t off64_t;
  +#define  open64  open
  +#define  lseek64 lseek
  +#define  NE_FMT_OFF64_T  NE_FMT_OFF_T
  +#endif
  +
   static const char data[] = "Hello, world.\n";
   static off64_t point = INT64_C(2) << 32;
   #define SPARSE "sparse.bin"
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2013-08-19 Thread Jeff Johnson
  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-Aug-2013 05:32:40
  Branch: rpm-5_4  Handle: 2013082003323900

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
- neon: add additional pre-req's using --with-neon=internal.

  Summary:
RevisionChanges Path
2.365.2.82  +4  -4  rpm/devtool.conf
  

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.81 -r2.365.2.82 devtool.conf
  --- rpm/devtool.conf  4 Aug 2013 21:35:01 -   2.365.2.81
  +++ rpm/devtool.conf  20 Aug 2013 03:32:39 -  2.365.2.82
  @@ -296,10 +296,10 @@
   --without-tomcrypt \
   --without-tpm \
   --with-libtasn1 \
  ---without-pakchois \
  ---with-gnutls \
  +--with-pakchois \
  +--without-gnutls \
   --with-neon=internal \
  ---without-libproxy \
  +--with-libproxy \
   --with-expat \
   --with-pcre=internal \
   --enable-utf \
  @@ -317,7 +317,7 @@
   --without-nix \
   --without-bash \
   --without-rc \
  ---with-mozjs185=/opt/local/lib:/opt/local/include/js \
  +--without-mozjs185 \
   --without-gpsee \
   --with-python=2.7 \
   --with-pythonembed=/usr/lib:/usr/include/python2.7 \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: neon/src/ Makefile.am rpm/ CHANGES

2013-08-19 Thread Jeff Johnson
  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 neon Date:   20-Aug-2013 05:28:24
  Branch: rpm-5_4  Handle: 2013082003282301

  Modified files:   (Branch: rpm-5_4)
neon/srcMakefile.am
rpm CHANGES

  Log:
- neon: add NEON_LIBS to pick up _GSS_C_NT_HOSTBASED_SERVICE using
--with-neon=internal on Mac OS X Lion.

  Summary:
RevisionChanges Path
1.1.4.1 +3  -0  neon/src/Makefile.am
1.3501.2.343+2  -0  rpm/CHANGES
  

  patch -p0 <<'@@ .'
  Index: neon/src/Makefile.am
  
  $ cvs diff -u -r1.1 -r1.1.4.1 Makefile.am
  --- neon/src/Makefile.am  23 Aug 2010 16:44:05 -  1.1
  +++ neon/src/Makefile.am  20 Aug 2013 03:28:24 -  1.1.4.1
  @@ -73,7 +73,10 @@
ne_xml.c \
ne_xmlreq.c
   
  +libneon_la_LIBADD = @NEON_LIBS@
  +
   libneon_la_LDFLAGS = # -release $(LT_CURRENT).$(LT_REVISION)
  +
   #if HAVE_LD_VERSION_SCRIPT
   #libneon_la_LDFLAGS += # -Wl,--version-script=$(srcdir)/librpmdb.vers
   #endif
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.342 -r1.3501.2.343 CHANGES
  --- rpm/CHANGES   19 Aug 2013 17:50:01 -  1.3501.2.342
  +++ rpm/CHANGES   20 Aug 2013 03:28:23 -  1.3501.2.343
  @@ -1,4 +1,6 @@
   5.4.13 -> 5.4.14:
  +- jbj: neon: add NEON_LIBS to pick up _GSS_C_NT_HOSTBASED_SERVICE using
  + --with-neon=internal on Mac OS X Lion.
   - jbj: start rpm-5.4.14 development.
   
   5.4.12 -> 5.4.13:
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: neon/ .version

2013-08-19 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: neon Date:   20-Aug-2013 05:27:33
  Branch: rpm-5_4  Handle: 2013082003273300

  Modified files:   (Branch: rpm-5_4)
neon.version

  Log:
- neon: get the version right.

  Summary:
RevisionChanges Path
1.9.2.2 +1  -1  neon/.version
  

  patch -p0 <<'@@ .'
  Index: neon/.version
  
  $ cvs diff -u -r1.9.2.1 -r1.9.2.2 .version
  --- neon/.version 5 Sep 2011 18:09:47 -   1.9.2.1
  +++ neon/.version 20 Aug 2013 03:27:33 -  1.9.2.2
  @@ -1 +1 @@
  -0.29.6
  +0.30.0
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: neon/test/ Makefile.in

2013-08-19 Thread Jeff Johnson
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: neon Date:   20-Aug-2013 01:18:51
  Branch: rpm-5_4  Handle: 2011090517442600

  Removed files:(Branch: rpm-5_4)
neon/test   Makefile.in

  Log:
- neon: remove generated cruft.

  Summary:
RevisionChanges Path
1.9 +0  -232neon/test/Makefile.in
  

  rm -f neon/test/Makefile.in <<'@@ .'
  Index: neon/test/Makefile.in
  
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac

2013-08-19 Thread Jeff Johnson
  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/misc/ librpmmisc.vers

2013-08-19 Thread Jeff Johnson
  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:25:21
  Branch: rpm-5_4  Handle: 2013081917252100

  Modified files:   (Branch: rpm-5_4)
rpm/misclibrpmmisc.vers

  Log:
- expose lua_setglobal.

  Summary:
RevisionChanges Path
1.35.2.3+1  -0  rpm/misc/librpmmisc.vers
  

  patch -p0 <<'@@ .'
  Index: rpm/misc/librpmmisc.vers
  
  $ cvs diff -u -r1.35.2.2 -r1.35.2.3 librpmmisc.vers
  --- rpm/misc/librpmmisc.vers  9 Jul 2013 08:52:07 -   1.35.2.2
  +++ rpm/misc/librpmmisc.vers  19 Aug 2013 17:25:21 -  1.35.2.3
  @@ -89,6 +89,7 @@
   lua_rawset;
   lua_rawseti;
   lua_remove;
  +lua_setglobal;
   lua_settable;
   lua_settop;
   lua_toboolean;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org


[CVS] RPM: rpm-5_4: rpm/ INSTALL

2013-08-19 Thread Jeff Johnson
  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:13:41
  Branch: rpm-5_4  Handle: 2013081917134100

  Modified files:   (Branch: rpm-5_4)
rpm INSTALL

  Log:
- update versions used.

  Summary:
RevisionChanges Path
2.134.2.4   +5  -5  rpm/INSTALL
  

  patch -p0 <<'@@ .'
  Index: rpm/INSTALL
  
  $ cvs diff -u -r2.134.2.3 -r2.134.2.4 INSTALL
  --- rpm/INSTALL   5 Jul 2013 16:50:58 -   2.134.2.3
  +++ rpm/INSTALL   19 Aug 2013 17:13:41 -  2.134.2.4
  @@ -33,18 +33,18 @@
   POPTmandatory 1.151.17http://rpm5.org/files/popt/
   BeeCryptmandatory 4.2.0   4.2.1   http://beecrypt.sourceforge.net/
   Libtasn.1   mandatory -   2.7 
http://www.gnu.org/software/libtasn1/
  -Neonmandatory 0.27.0  0.29.6  http://www.webdav.org/neon/
  +Neonmandatory 0.27.0  0.30.0  http://www.webdav.org/neon/
   PCREmandatory 7.0 8.33http://www.pcre.org/
  -Mozilla NSS optional  3.113.14.3  
http://www.mozilla.org/projects/security/pki/nss/
  +Mozilla NSS optional  3.113.15.1  
http://www.mozilla.org/projects/security/pki/nss/
   OpenSSL optional  0.9.8   1.0.0e  http://www.openssl.org/
  -Berkeley-DB [1] optional  5.3.21  5.3.21  
http://www.oracle.com/database/berkeley-db.html
  +Berkeley-DB [1] optional  6.0.20  6.0.20  
http://www.oracle.com/database/berkeley-db.html
   SQLite  [1] optional  3.3 3.7.0.1 http://www.sqlite.org/
   Lua [2] optional  5.2 5.2.2   http://www.lua.org/
  -ZLiboptional  1.2 1.2.3   http://www.zlib.net/
  +ZLiboptional  1.2 1.2.8   http://www.zlib.net/
   Bzip2   optional  1.0 1.0.5   http://www.bzip.org/
   XZ Utils[3] optional  4.999.9 5.0.4   http://tukaani.org/xz/
   File/magic  [4] optional  4.005.14ftp://ftp.astron.com/pub/file/
  -GNU gettext optional  0.18
0.18.2.1http://www.gnu.org/software/gettext/
  +GNU gettext optional  0.18
0.18.3.1http://www.gnu.org/software/gettext/
   GNU iconv   optional  1.111.11
http://www.gnu.org/software/libiconv/
   OSSP uuid   optional  1.6.0   1.6.2   http://www.ossp.org/pkg/lib/uuid/
   XAR [5] optional  1.5.2   1.5.2   http://code.google.com/p/xar/
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org