RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   05-Dec-2007 10:53:17
  Branch: HEAD                             Handle: 2007120509531700

  Modified files:
    rpm                     CHANGES devtool.conf

  Log:
    add XAR support to "devtool standalone"

  Summary:
    Revision    Changes     Path
    1.1941      +1  -0      rpm/CHANGES
    2.139       +55 -4      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1940 -r1.1941 CHANGES
  --- rpm/CHANGES	5 Dec 2007 03:59:26 -0000	1.1940
  +++ rpm/CHANGES	5 Dec 2007 09:53:17 -0000	1.1941
  @@ -1,4 +1,5 @@
   5.0a4 -> 5.0b1:
  +    - rse: add XAR support to "devtool standalone"
       - jbj: fix: s/RPM_/RPMLIB_/ in rpmversion.h.in. That should "stick" now.
       - rpm.org: credit for the original NSS hacks.
       - jbj: no-brainer AutoFu for WITH_NSS enabling, add rpmnss.[ch] to rpmio.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.138 -r2.139 devtool.conf
  --- rpm/devtool.conf	5 Dec 2007 08:36:21 -0000	2.138
  +++ rpm/devtool.conf	5 Dec 2007 09:53:17 -0000	2.139
  @@ -219,6 +219,8 @@
           v_lua="5.1.2"
           v_file="4.21"
           v_popt="1.12"
  +        v_libxml2="2.6.30"
  +        v_xar="1.5.1"
           v_config="20071205"
   
           #   third-party distribution files
  @@ -239,6 +241,8 @@
           dist="${dist} lua-${v_lua}.tar.gz,http://rpm5.org/files/3rd/,http://www.lua.org/ftp/"
           dist="${dist} file-${v_file}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.astron.com/pub/file/"
           dist="${dist} popt-${v_popt}.tar.gz,http://rpm5.org/files/3rd/,http://rpm5.org/files/popt/"
  +        dist="${dist} libxml2-${v_libxml2}.tar.gz,http://rpm5.org/files/3rd/,ftp://xmlsoft.org/libxml2/"
  +        dist="${dist} xar-${v_xar}.tar.gz,http://rpm5.org/files/3rd/,http://xar.googlecode.com/files/"
   
           #   third-party distribution patches (for portability and bugfix reasons only)
           dist="${dist} automake-${v_automake}.patch,http://rpm5.org/files/3rd/"
  @@ -250,6 +254,8 @@
           dist="${dist} lua-${v_lua}.patch,http://rpm5.org/files/3rd/"
           dist="${dist} file-${v_file}.patch,http://rpm5.org/files/3rd/"
           dist="${dist} popt-${v_popt}.patch,http://rpm5.org/files/3rd/"
  +        dist="${dist} libxml2-${v_libxml2}.patch,http://rpm5.org/files/3rd/"
  +        dist="${dist} xar-${v_xar}.patch,http://rpm5.org/files/3rd/"
           dist="${dist} config.guess-${v_config},http://rpm5.org/files/3rd/"
           dist="${dist} config.sub-${v_config},http://rpm5.org/files/3rd/"
       }
  @@ -756,6 +762,48 @@
                   ) || exit $?
               ) || exit $?
           fi
  +
  +        #   LibXML2 (uninstalled third-party library)
  +        if [ ! -d "$base3rd/bin/$platform/libxml2-${v_libxml2}" ]; then
  +            echo "++ building third-party library libxml2-${v_libxml2}"
  +            (   cd $base3rd/bin/$platform
  +                rm -rf libxml2-${v_libxml2}
  +                $gzip -d -c ../../src/libxml2-${v_libxml2}.tar.gz | $tar xf -
  +                $SHTOOL subst \
  +                    -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
  +                    configure
  +                (   cd libxml2-${v_libxml2}
  +                    $patch -p0 <../../../src/libxml2-${v_libxml2}.patch
  +                    CC="$cc" \
  +                    ./configure \
  +                        --without-iconv \
  +                        --disable-shared \
  +                        --disable-corba \
  +                        --without-threads \
  +                        --without-python
  +                    make
  +                ) || exit $?
  +            ) || exit $?
  +        fi
  +
  +        #   XAR (uninstalled third-party library)
  +        if [ ! -d "$base3rd/bin/$platform/xar-${v_xar}" ]; then
  +            echo "++ building third-party library xar-${v_xar}"
  +            (   cd $base3rd/bin/$platform
  +                rm -rf xar-${v_xar}
  +                $gzip -d -c ../../src/xar-${v_xar}.tar.gz | $tar xf -
  +                (   cd xar-${v_xar}
  +                    $patch -p0 <../../../src/xar-${v_xar}.patch
  +                    CC="$cc" \
  +                    CPPFLAGS="-I`pwd`/../openssl-${v_openssl}/include -I`pwd`/../zlib-${v_zlib} -I`pwd`/../libxml2-${v_libxml2}/include" \
  +                    LDFLAGS="-L`pwd`/../openssl-${v_openssl}/lib -L`pwd`/../zlib-${v_zlib} -L`pwd`/../libxml2-${v_libxml2} -L`pwd`/../libxml2-${v_libxml2}/.libs" \
  +                    ./configure \
  +                        --disable-autogen \
  +                        --disable-shared
  +                    make
  +                ) || exit $?
  +            ) || exit $?
  +        fi
       }
   
       #   configure build environment
  @@ -778,9 +826,12 @@
           if [ ".`grep 'OpenPKG RPM' ${DEVTOOL_SRCDIR}/rpmqv.c`" != . ]; then
               CPPFLAGS="$CPPFLAGS -DOPENPKG"
           fi
  -        LDFLAGS="$LDFLAGS -L$base3rd/bin/$platform/openssl-${v_openssl}" # shameless workaround for Neon
  -        LIBS="$LIBS -lssl -lcrypto"                                      # shameless workaround for Neon
  -        LIBS="$LIBS -lm"                                                 # shameless workaround for SQLite
  +        LDFLAGS="$LDFLAGS -L$base3rd/bin/$platform/openssl-${v_openssl}"       # shameless workaround for Neon/XAR
  +        LDFLAGS="$LDFLAGS -L$base3rd/bin/$platform/libxml2-${v_libxml2}/.libs" # shameless workaround for XAR
  +        LDFLAGS="$LDFLAGS -L$base3rd/bin/$platform/zlib-${v_zlib}"             # shameless workaround for XAR
  +        LIBS="$LIBS -lssl -lcrypto"                                            # shameless workaround for Neon/XAR
  +        LIBS="$LIBS -lxml2 -lz"                                                # shameless workaround for XAR
  +        LIBS="$LIBS -lm"                                                       # shameless workaround for SQLite
           export CFLAGS
           export CPPFLAGS
           export LDFLAGS
  @@ -803,7 +854,7 @@
               --with-bzip2="$base3rd/bin/$platform/bzip2-${v_bzip2}" \
               --with-neon="$base3rd/bin/$platform/neon-${v_neon}" \
               --with-popt="$base3rd/bin/$platform/popt-${v_popt}" \
  -            --without-xar \
  +            --with-xar="$base3rd/bin/$platform/xar-${v_xar}" \
               --with-sqlite="$base3rd/bin/$platform/sqlite-${v_sqlite}" \
               --with-db="$base3rd/bin/$platform/db-${v_db}/build_unix" \
               --without-db-rpc \
  @@ .