From 640c529741c502b13adb2e0c43f72ad1728e2811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Wed, 6 Jan 2021 14:32:30 +0100 Subject: groups/241.native_packages_inet.group: drop pacman MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lucio Andrés Illanes Albornoz --- groups/241.native_packages_inet.group | 7 +----- patches/pacman-5.0.1.local.patch | 44 ----------------------------------- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 patches/pacman-5.0.1.local.patch diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 9777679f..3ea6d9c3 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -6,7 +6,7 @@ NATIVE_PACKAGES_PACKAGES="$(rtl_lconcat "${NATIVE_PACKAGES_PACKAGES}" " apk_tools aria2 bind ca_certificates curl dropbear fetchmail git gnupg gpgme gnutls httpd icecast inetutils irssi isync ldns lighttpd links lynx mailutils microsocks mtr mutt nginx nullmailer openlitespeed opensmtpd openssh -pacman proxytunnel rsync socat thttpd w3m weechat wget whois")"; +proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_APK_TOOLS_DEPENDS:="libfetch libressl libz"}; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; @@ -179,11 +179,6 @@ pacman proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_OPENSSH_DEBUG_CONFIGURE_ARGS_EXTRA:=--disable-strip}; : ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys}; : ${PKG_OPENSSH_MAKEFLAGS_INSTALL_EXTRA:=STRIP_OPT=}; -: ${PKG_PACMAN_SHA256SUM:=84599e2ee2158134fd704f1cd681ea46e021165bed4df5f002aa1748caef9e7b}; -: ${PKG_PACMAN_VERSION:=5.0.1}; -: ${PKG_PACMAN_URL:=https://projects.archlinux.org/pacman.git/snapshot/pacman-${PKG_PACMAN_VERSION}.tar.gz}; -: ${PKG_PACMAN_CONFIGURE_ARGS_EXTRA:=--disable-doc}; -: ${PKG_PACMAN_DISABLED:=1}; : ${PKG_PROXYTUNNEL_DEPENDS:="libressl"}; : ${PKG_PROXYTUNNEL_SHA256SUM:=6495430e9c60d3df53824a7a0f3bea9953a89d083a3718c72db04dc4d40755ac}; : ${PKG_PROXYTUNNEL_VERSION:=1.10.20200507} diff --git a/patches/pacman-5.0.1.local.patch b/patches/pacman-5.0.1.local.patch deleted file mode 100644 index 7df4cd24..00000000 --- a/patches/pacman-5.0.1.local.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- pacman-5.0.1/lib/libalpm/Makefile.am.orig 2016-02-23 03:46:25.000000000 +0000 -+++ pacman-5.0.1/lib/libalpm/Makefile.am 2016-05-31 06:39:23.693111052 +0000 -@@ -78,6 +78,7 @@ - $(GPGME_LIBS) \ - $(LIBARCHIVE_LIBS) \ - $(LIBCURL_LIBS) \ -- $(LIBSSL_LIBS) -+ $(LIBSSL_LIBS) \ -+ $(LIBALPM_LIBS) - - # vim:set noet: ---- pacman-5.0.1/src/pacman/Makefile.am.orig 2016-02-23 03:46:25.000000000 +0000 -+++ pacman-5.0.1/src/pacman/Makefile.am 2016-05-31 08:33:33.452959027 +0000 -@@ -47,6 +47,6 @@ - util.h util.c \ - util-common.h util-common.c - --LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la -+LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/libalpm.la - - # vim:set noet: ---- pacman-5.0.1/src/util/Makefile.am.orig 2016-02-23 03:46:25.000000000 +0000 -+++ pacman-5.0.1/src/util/Makefile.am 2016-05-31 08:33:48.912958683 +0000 -@@ -19,16 +19,16 @@ - $(LIBARCHIVE_CFLAGS) - - cleanupdelta_SOURCES = cleanupdelta.c --cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -+cleanupdelta_LDADD = $(top_builddir)/lib/libalpm/libalpm.la - - pacsort_SOURCES = pacsort.c util-common.c --pacsort_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -+pacsort_LDADD = $(top_builddir)/lib/libalpm/libalpm.la - - pactree_SOURCES = pactree.c util-common.c --pactree_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -+pactree_LDADD = $(top_builddir)/lib/libalpm/libalpm.la - - testpkg_SOURCES = testpkg.c --testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la -+testpkg_LDADD = $(top_builddir)/lib/libalpm/libalpm.la - - vercmp_SOURCES = vercmp.c - vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm_la-version.lo -- cgit v1.2.3