Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f1af902731e237de0aeb1c45d0f5048d2cf23731)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f1af902731e237de0aeb1c45d0f5048d2cf23731)
  • Date: Wed, 29 Mar 2023 16:49:56 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

archive/rpm/BUILD | 2 +-
archive/rpm/DEPENDS | 3 +--
archive/rpm/HISTORY | 6 +++++-
archive/rpm4/BUILD | 9 +++++++++
archive/rpm4/DEPENDS | 31 +++++++++++++++++++++++++++++++
archive/rpm4/DETAILS | 4 ++--
archive/rpm4/HISTORY | 5 +++++
7 files changed, 54 insertions(+), 6 deletions(-)

New commits:
commit f1af902731e237de0aeb1c45d0f5048d2cf23731
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rpm4 4.18.1

commit fd0872b1e7671d77ce9bc8518293edb04f3d899c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rpm: Remove duplicated gettext dep

commit df5f75aba515096f18e644909d37415d73c81e6a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rpm: Move sqlite configure option to the dependency

diff --git a/archive/rpm/BUILD b/archive/rpm/BUILD
index c8da141..b8e281a 100755
--- a/archive/rpm/BUILD
+++ b/archive/rpm/BUILD
@@ -1,6 +1,6 @@
WITH_DB_SUBDIR=/usr/lib &&
export LDFLAGS=${LDFLAGS/-z combreloc/} &&
OPTS="$OPTS $RPM_API $RPM_SELINUX --with-libintl-prefix=/usr" &&
-OPTS="$OPTS --with-sqlite=external --disable-openmp"
+OPTS="$OPTS --disable-openmp"
#export CPPFLAGS="$CPPFLAGS -I/usr/include/python$(installed_version python|
cut -c 1-3)" &&
default_build
diff --git a/archive/rpm/DEPENDS b/archive/rpm/DEPENDS
index ff788bf..f340ed6 100755
--- a/archive/rpm/DEPENDS
+++ b/archive/rpm/DEPENDS
@@ -1,13 +1,12 @@
depends zlib &&
depends bzip2 &&
-depends sqlite &&
depends db &&
depends popt &&
depends LIBELF &&
depends neon &&
depends file &&
-depends gettext &&
depends beecrypt &&
+depends sqlite --with-sqlite=external &&
optional_depends gettext "--enable-nls" "--disable-nls" "NLS support"
&&
optional_depends python "--with-python" "--without-python" "python
bindings" &&
optional_depends perl "--with-perl" "--without-perl" "perl
bindings" &&
diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index f00f2d6..e1ce073 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -1,4 +1,8 @@
-2019-01-19 Treeve Jelbert <treeve AT sourcemage.org>
+2023-03-29 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS: moved sqlite configure option to the dependency
+ * DEPENDS: removed duplicated gettext dependency
+
+2019-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: delete gnupg

2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/archive/rpm4/BUILD b/archive/rpm4/BUILD
new file mode 100755
index 0000000..d82d8a0
--- /dev/null
+++ b/archive/rpm4/BUILD
@@ -0,0 +1,9 @@
+OPTS+=' --disable-openmp' &&
+case "$BUILD" in
+ (*-musl)
+ if is_depends_enabled "$SPELL" gettext; then
+ LDFLAGS+=' -lintl'
+ fi
+ ;;
+esac &&
+default_build
diff --git a/archive/rpm4/DEPENDS b/archive/rpm4/DEPENDS
new file mode 100755
index 0000000..008c8ce
--- /dev/null
+++ b/archive/rpm4/DEPENDS
@@ -0,0 +1,31 @@
+optional_depends LIBELF --enable-libelf={yes,no} \
+ 'build with libelf support' &&
+optional_depends acl --with-acl={yes,no} \
+ 'to build with ACL support' &&
+optional_depends audit --with-audit={yes,no} \
+ 'for Linux audit plugin' &&
+optional_depends gettext --enable-nls={yes,no} \
+ 'for Native Language Support' &&
+optional_depends libarchive --with-archive={yes,no} \
+ 'to build rpm2archive' &&
+optional_depends libcap --with-cap={yes,no} \
+ 'to build with capabilities support' &&
+optional_depends libfsverity --with-fsverity={yes,no} \
+ 'for fsverity support' &&
+optional_depends libgcrypt --with-crypto={libgcrypt,openssl} \
+ 'to use libgcrypt as cypto backend (recommended)' &&
+if ! is_depends_enabled "$SPELL" libgcrypt; then
+ depends SSL
+fi &&
+optional_depends libimaevm --with-imaevm={yes,no} \
+ 'for Linux Integrity Measurement Architecture (IMA)
Extended Verification Module (EVM) support' &&
+optional_depends libselinux --with-selinux={yes,no} \
+ 'to build with SELinux support' &&
+optional_depends python3 --enable-python={yes,no} \
+ 'to build RPM python bindings' &&
+optional_depends readline --with-readline={yes,no} \
+ 'to build with readline support' &&
+optional_depends sqlite --enable-sqlite={yes,no} \
+ 'for SQLite RPM database support (recommended)' &&
+optional_depends zstd --enable-zstd={yes,no} \
+ 'ZStandard compression support'
diff --git a/archive/rpm4/DETAILS b/archive/rpm4/DETAILS
index 10fe6bd..1e8dbfc 100755
--- a/archive/rpm4/DETAILS
+++ b/archive/rpm4/DETAILS
@@ -1,9 +1,9 @@
# Watch: https://rpm.org/download.html /rpm-([0-9.]+)[.]tar
SPELL=rpm4
- VERSION=4.18.0
+ VERSION=4.18.1
SOURCE="rpm-${VERSION}.tar.bz2"

SOURCE_URL[0]=https://ftp.osuosl.org/pub/rpm/releases/rpm-${VERSION%.*}.x/${SOURCE}
-
SOURCE_HASH=sha512:c218b811c0c2db368a2919f60742904a4a5abf09dc20804d649eb42f1853d1c21d121086d6014cd210b2040643c37b5d86b53052958cf702ae2e54fe65f1c0ec
+
SOURCE_HASH=sha512:0ede2138b9b4c3b50d7e914cf82655507fcc207ba67804c749ea17560002976cb26b95801e9138a51589b60459494a991213a1131dbef5af2eca9b5050a4f29c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/rpm-${VERSION}"
WEB_SITE="https://rpm.org/";
LICENSE[0]="GPL"
diff --git a/archive/rpm4/HISTORY b/archive/rpm4/HISTORY
index 31a8817..b2b6af6 100644
--- a/archive/rpm4/HISTORY
+++ b/archive/rpm4/HISTORY
@@ -1,3 +1,8 @@
+2023-03-29 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.18.1
+ * DEPENDS: added dependencies
+ * BUILD: disabled openmp, added flags to build against musl
+
2022-10-13 Ismael Luceno <ismael AT sourcemage.org>
*
patches/0001-Remove-superflous-include-of-non-standard-error.h.patch:
removed, no longer needed



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f1af902731e237de0aeb1c45d0f5048d2cf23731), Ismael Luceno, 03/29/2023

Archive powered by MHonArc 2.6.24.

Top of Page