rpm-4.13.0-rc1-lite

rpm-4.13.0-rc1-lite.diff

diff --git a/Makefile.am b/Makefile.am
index 4b5d1d8..a225237 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ endif
 if WITH_LUA
 SUBDIRS += luaext
 endif
-SUBDIRS += rpmio lib sign build scripts fileattrs doc .
+SUBDIRS += rpmio lib .
 
 if ENABLE_PYTHON
 SUBDIRS += python
@@ -40,7 +40,6 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
 AM_CPPFLAGS += -I$(top_srcdir)/build
 AM_CPPFLAGS += -I$(top_srcdir)/lib
 AM_CPPFLAGS += -I$(top_srcdir)/rpmio
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += -I$(top_srcdir)/misc
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
@@ -90,16 +89,6 @@ pkginclude_HEADERS += build/rpmbuild.h
 pkginclude_HEADERS += build/rpmfc.h
 pkginclude_HEADERS += build/rpmspec.h
 
-
-rpmbindir = `echo $(bindir) | $(SED) -e s,usr/bin,bin,`
-rpmbin_PROGRAMS = rpm
-
-bin_PROGRAMS =		rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec
-if WITH_ARCHIVE
-bin_PROGRAMS += 	rpm2archive 
-endif
-
-rpmlibexec_PROGRAMS =
 rpmconfig_SCRIPTS =	mkinstalldirs \
 			config.guess config.sub
 
@@ -109,75 +98,6 @@ libcliutils_la_CPPFLAGS =	$(AM_CPPFLAGS)
 libcliutils_la_LIBADD = 	lib/librpm.la rpmio/librpmio.la
 libcliutils_la_LIBADD +=	@WITH_POPT_LIB@
 
-rpm_SOURCES =		rpmqv.c debug.h system.h
-rpm_CPPFLAGS =		$(AM_CPPFLAGS) -DIAM_RPMEIU -DIAM_RPMQ -DIAM_RPMV
-rpm_LDADD =		libcliutils.la
-rpm_LDADD +=		lib/librpm.la rpmio/librpmio.la
-rpm_LDADD +=		@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmdb_SOURCES =		rpmdb.c debug.h system.h
-rpmdb_CPPFLAGS =	$(AM_CPPFLAGS)
-rpmdb_LDADD =		libcliutils.la
-rpmdb_LDADD +=		lib/librpm.la rpmio/librpmio.la
-rpmdb_LDADD +=		@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmkeys_SOURCES =	rpmkeys.c debug.h system.h
-rpmkeys_CPPFLAGS =	$(AM_CPPFLAGS)
-rpmkeys_LDADD =		libcliutils.la
-rpmkeys_LDADD +=	lib/librpm.la rpmio/librpmio.la
-rpmkeys_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmsign_SOURCES =	rpmsign.c debug.h system.h
-rpmsign_CPPFLAGS =	$(AM_CPPFLAGS)
-rpmsign_LDADD =		libcliutils.la
-rpmsign_LDADD +=	sign/librpmsign.la lib/librpm.la rpmio/librpmio.la
-rpmsign_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmbuild_SOURCES =	rpmbuild.c debug.h system.h
-rpmbuild_CPPFLAGS =	$(AM_CPPFLAGS)
-rpmbuild_LDADD =	libcliutils.la
-rpmbuild_LDADD +=	build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
-rpmbuild_LDADD += 	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpmspec_SOURCES =	rpmspec.c debug.h system.h
-rpmspec_CPPFLAGS =	$(AM_CPPFLAGS)
-rpmspec_LDADD =		libcliutils.la
-rpmspec_LDADD +=	build/librpmbuild.la lib/librpm.la rpmio/librpmio.la
-rpmspec_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpm2cpio_SOURCES =	rpm2cpio.c debug.h system.h
-rpm2cpio_LDADD =	lib/librpm.la rpmio/librpmio.la
-rpm2cpio_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@
-
-rpm2archive_SOURCES =	rpm2archive.c debug.h system.h
-rpm2archive_LDADD =	lib/librpm.la rpmio/librpmio.la
-rpm2archive_LDADD +=	@WITH_NSS_LIB@ @WITH_POPT_LIB@ @WITH_ZLIB_LIB@ @WITH_ARCHIVE_LIB@
-
-
-if LIBELF
-if LIBDWARF
-rpmconfig_SCRIPTS += scripts/find-debuginfo.sh
-
-rpmlibexec_PROGRAMS +=	debugedit
-debugedit_SOURCES =	tools/debugedit.c tools/hashtab.c tools/hashtab.h
-debugedit_LDADD =	rpmio/librpmio.la
-debugedit_LDADD +=	@WITH_LIBELF_LIB@ @WITH_POPT_LIB@
-
-rpmlibexec_PROGRAMS +=	elfdeps
-elfdeps_SOURCES =	tools/elfdeps.c
-elfdeps_LDADD =		rpmio/librpmio.la
-elfdeps_LDADD +=	@WITH_LIBELF_LIB@ @WITH_POPT_LIB@
-endif
-endif
-
-rpmlibexec_PROGRAMS +=	rpmdeps
-rpmdeps_SOURCES =	tools/rpmdeps.c
-rpmdeps_LDADD =		lib/librpm.la rpmio/librpmio.la build/librpmbuild.la @WITH_POPT_LIB@
-
-bin_PROGRAMS +=		rpmgraph
-rpmgraph_SOURCES =	tools/rpmgraph.c
-rpmgraph_LDADD =	lib/librpm.la rpmio/librpmio.la @WITH_POPT_LIB@
-
 dist_bin_SCRIPTS =	scripts/gendiff
 
 rpmconfig_DATA = rpmrc
diff --git a/configure.ac b/configure.ac
index bb368a9..fc40345 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,60 +243,6 @@ AC_CHECK_HEADERS([dwarf.h], [
 AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes])
 
 #=================
-# Check for beecrypt library if requested.
-AC_ARG_WITH(beecrypt, [  --with-beecrypt         build with beecrypt support ],,[with_beecrypt=no])
-AC_ARG_WITH(internal_beecrypt, [  --with-internal-beecrypt build with internal beecrypt library ],,[with_internal_beecrypt=no])
-AM_CONDITIONAL([WITH_INTERNAL_BEECRYPT],[test "$with_internal_beecrypt" = yes])
-if test "$with_internal_beecrypt" = yes ; then
-  with_beecrypt=yes
-fi
-AM_CONDITIONAL([WITH_BEECRYPT],[test "$with_beecrypt" = yes])
-
-WITH_BEECRYPT_INCLUDE=
-WITH_BEECRYPT_LIB=
-if test "$with_beecrypt" = yes ; then
-  AC_DEFINE(WITH_BEECRYPT, 1, [Build with beecrypt instead of nss3 support?])
-  if test "$with_internal_beecrypt" = yes ; then
-    WITH_BEECRYPT_INCLUDE="-I\$(top_srcdir)/beecrypt"
-    AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
-  else
-    AC_CHECK_LIB(beecrypt, mpfprintln, [
-      WITH_BEECRYPT_LIB="-lbeecrypt"
-    ],[
-      AC_MSG_ERROR([missing required library 'beecrypt']) 
-    ])
-    AC_CHECK_HEADER([beecrypt/api.h], [AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
-    ])
-  fi
-fi
-AC_SUBST(WITH_BEECRYPT_LIB)
-AC_SUBST(WITH_BEECRYPT_INCLUDE)
-
-#=================
-# Check for NSS library.
-# We need nss.h from NSS which needs nspr.h. Unfortunately both glibc and NSS 
-# have a header named nss.h... so make extra check for NSS's sechash.h 
-# which we use too and hopefully is slightly more unique to NSS.
-WITH_NSS_INCLUDE=
-WITH_NSS_LIB=
-if test "$with_beecrypt" != yes ; then
-AC_CHECK_HEADERS([nspr.h nss.h sechash.h], [], [
-  AC_MSG_ERROR([missing required NSPR / NSS header])
-])
-AC_CHECK_LIB(nss3, VFY_VerifyDigestDirect, [
-  WITH_NSS_LIB=-lnss3
-  AC_CHECK_LIB(nss3, NSS_InitContext, [
-    AC_DEFINE(HAVE_NSS_INITCONTEXT, 1, [Define to 1 if NSS has NSS_InitContext])
-    AC_SUBST(HAVE_NSS_INITCONTEXT, [1])
-  ])
-], [
-  AC_MSG_ERROR([required NSS library 'nss3' missing or too old])
-])
-fi
-AC_SUBST(WITH_NSS_INCLUDE)
-AC_SUBST(WITH_NSS_LIB)
-
-#=================
 # Check for magic library.
 WITH_MAGIC_INCLUDE=
 WITH_MAGIC_LIB=
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a65eb80..0747bff 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,6 @@
 include $(top_srcdir)/rpm.am
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += -I$(top_srcdir)/misc
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 68a8219..50cde49 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -3,8 +3,6 @@
 include $(top_srcdir)/rpm.am
 
 AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
-AM_CPPFLAGS += @WITH_NSS_INCLUDE@
-AM_CPPFLAGS += @WITH_BEECRYPT_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += -I$(top_srcdir)/misc
 AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
@@ -20,18 +18,9 @@ librpmio_la_SOURCES = \
 	rpmstring.c rpmfileutil.c rpmglob.c \
 	rpmkeyring.c rpmstrpool.c
 
-if WITH_BEECRYPT
-librpmio_la_SOURCES += digest_beecrypt.c
-else
-librpmio_la_SOURCES += digest_nss.c
-endif
-
-
 librpmio_la_LDFLAGS = -version-info $(rpm_version_info)
 librpmio_la_LIBADD = \
 	../misc/libmisc.la \
-	@WITH_NSS_LIB@ \
-	@WITH_BEECRYPT_LIB@ \
 	@WITH_BZ2_LIB@ \
 	@WITH_ZLIB_LIB@ \
 	@WITH_LIBELF_LIB@ \
@@ -39,15 +28,6 @@ librpmio_la_LIBADD = \
 	@WITH_LZMA_LIB@ \
 	-lpthread
 
-if WITH_INTERNAL_BEECRYPT
-librpmio_la_LIBADD += $(libbeecrypt_la)
-
-libbeecrypt_la = $(top_builddir)/beecrypt/libbeecrypt_nolibdir.la
-
-$(top_builddir)/beecrypt/libbeecrypt_nolibdir.la: $(top_builddir)/beecrypt/libbeecrypt.la
-	sed -e 's/libdir=.*/libdir=/' < $(top_builddir)/beecrypt/libbeecrypt.la > $(top_builddir)/beecrypt/libbeecrypt_nolibdir.la
-endif
-
 if WITH_LUA
 AM_CPPFLAGS += -I$(top_srcdir)/luaext/
 AM_CPPFLAGS += @LUA_CFLAGS@