- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH v2] Option to enable running makepkg in
by Saul Tigh 16 Jan '20

16 Jan '20

Although running makepkg in root is frowned upon, there ae circumstances that one might need to do so. For example, during the bootstrap process of building my own toy gnu/linux distro, I need to run makepkg in root. This option is disabled by default. It can be enabled by setting 'ALLOWROOT' in makepkg to 1. --- scripts/makepkg.sh.in | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ca3e7459..b2cd8ee4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -79,6 +79,7 @@ SIGNPKG='' SPLITPKG=0 SOURCEONLY=0 VERIFYSOURCE=0 +ALLOWROOT=0 if [[ -n $SOURCE_DATE_EPOCH ]]; then REPRODUCIBLE=1 @@ -1175,9 +1176,13 @@ fi if (( ! INFAKEROOT )); then if (( EUID == 0 )); then - error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ -catastrophic damage to your system.")" "makepkg" - exit $E_ROOT + if (( ALLOWROOT )); then + plain "Running as root is not recommended. Proceed with caution." + else + error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ + catastrophic damage to your system.")" "makepkg" + exit $E_ROOT + fi fi else if [[ -z $FAKEROOTKEY ]]; then @@ -1352,6 +1357,10 @@ if (( SOURCEONLY )); then check_source_integrity all cd_safe "$startdir" + # allow makepkg to run in root + if (( ALLOWROOT )); then + unset FAKEROOTKEY + fi enter_fakeroot if [[ $SIGNPKG = 'y' ]]; then -- 2.20.1

1 0

[pacman-dev] [PATCH] Remove unneeded ltmain patch
by Allan McRae 16 Jan '20

16 Jan '20

Many moons ago, libtool was bad - I mean worse than today! It gobbled all --as-needed and we ended up with an overlinked libalpm. This was annoying, particularly when dealing with soname bumps in libraries pacman/libalpm had no business linking to. Luckily we had a fix, stolen from GNOME I believe. And with that fix, we lived in harmony with libtool for many years. Until one day, unbeknownst to us, libtool was "fixed". We kept applying our patch, because it still applied, but it did worse than nothing. It gobbled up our other LDFLAGS, and our libalpm started missing out on RELRO and BIND_NOW. This made the Arch Security Team unhappy. We will make them happy again by stopping the patch. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- autogen.sh | 6 ------ build-aux/ltmain-asneeded.patch | 33 --------------------------------- 2 files changed, 39 deletions(-) delete mode 100755 autogen.sh delete mode 100644 build-aux/ltmain-asneeded.patch diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 18fa641d..00000000 --- a/autogen.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -x - -autoreconf -i -patch -d build-aux -Np0 -i ltmain-asneeded.patch - -exit 0 diff --git a/build-aux/ltmain-asneeded.patch b/build-aux/ltmain-asneeded.patch deleted file mode 100644 index af5ae6b2..00000000 --- a/build-aux/ltmain-asneeded.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- ltmain.sh.orig 2013-06-26 14:31:53.472627840 +1000 -+++ ltmain.sh 2013-06-26 14:30:56.137038936 +1000 -@@ -5800,6 +5800,14 @@ - arg=$func_stripname_result - ;; - -+ -Wl,*--as-needed*) -+ deplibs="$deplibs $wl--as-needed" -+ ;; -+ -+ -Wl,*--no-as-needed*) -+ deplibs="$deplibs $wl--no-as-needed" -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6160,6 +6168,15 @@ - lib= - found=no - case $deplib in -+ -Wl,--as-needed|-Wl,--no-as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then -- 2.25.0

1 0

[pacman-dev] [PATCH] Increase meson test timeout
by Allan McRae 16 Jan '20

16 Jan '20

Running the testsuite using "PACTEST_VALGRIND=1 ninja test -C build", I ran into the following failure: 161/332 smoke001.py TIMEOUT 30.02 s I figure an i7 @ 3.10GHz should be enough to run our testsuite... so boost the meson test timeout to 120 seconds (which should be enough time for anyone...). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- With this patch, I can run the test under valgrind. e.g. 161/332 smoke001.py OK 36.42 s test/pacman/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/test/pacman/meson.build b/test/pacman/meson.build index 4e87b4f3..9de4f5a1 100644 --- a/test/pacman/meson.build +++ b/test/pacman/meson.build @@ -352,5 +352,6 @@ foreach input : pacman_tests PYTHON, protocol : 'tap', args : args, + timeout: 120, depends : [pacman_bin]) endforeach -- 2.25.0

1 0

[pacman-dev] [PATCH] autotools: preserve LDFLAGS when building libalpm
by anthraxx＠archlinux.org 16 Jan '20

16 Jan '20

From: Levente Polyak <anthraxx(a)archlinux.org> Use AM_LDFLAGS for libalpm_la so defined LDFLAGS will not be ignored. Signed-off-by: anthraxx <anthraxx(a)archlinux.org> --- lib/libalpm/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index e4f83223..06dc0e43 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -59,7 +59,7 @@ libalpm_la_SOURCES = \ util-common.h util-common.c \ version.c -libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) +libalpm_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info $(LIB_VERSION_INFO) libalpm_la_CFLAGS = \ $(AM_CFLAGS) \ -- 2.25.0

2 2

[pacman-dev] [PATCH] makepkg: fix one more file-seccomp issue
by Eli Schwartz 10 Jan '20

10 Jan '20

When file is called via fakeroot, it doesn't matter whether you use -z or not, it is still incompatible with seccomp. Fix by configuring it with FILECMD when used in the fakeroot 'tidy' run. Fixes FS#65100 Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- For release/5.2.x only since the call site is gone in master. scripts/libmakepkg/tidy/strip.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 1bd810f0..876f00f0 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -111,7 +111,7 @@ tidy_strip() { local binary strip_flags find . -type f -perm -u+w -print0 2>/dev/null | while IFS= read -rd '' binary ; do - case "$(file -bi "$binary")" in + case "$(@FILECMD@ -bi "$binary")" in *application/x-sharedlib*) # Libraries (.so) strip_flags="$STRIP_SHARED";; *application/x-archive*) # Libraries (.a) -- 2.24.1

1 0

[pacman-dev] [Usage] run pacman without root
by nly＠disroot.org 08 Jan '20

08 Jan '20

Is it possible to use pacman without root, and locally, say `~/pacman` instead of global `/usr'. I built and installed pacman from git sources. $ cd pacman && git checkout v5.2.1 $ autoreconf -vif $ ./configure --prefix=$HOME/pacman/usr/local --enable-static --with-libcurl --with-gpgme $ make $ make install Adding pacman to path, `.bashrc': source /home/nly/pacman/usr/local/etc/profile # (4.) $ pacman -Q nano warning: database file for 'core' does not exist (use '-Sy' to download) error: package 'nano' was not found $ pacman -Sy error: you cannot perform this operation unless you are root. I've linked to the etc/pacman.conf (3.) and etc/pacman.d/mirrorlist (2.). Thanks, Amar ---------------- 1. makepkg-conf: http://nly.info.tm/pacman/makepkg.conf 2. mirrorlist: http://nly.info.tm/pacman/mirrorlist 3. pacman-conf: http://nly.info.tm/pacman/pacman.conf 4. bash-profile: http://nly.info.tm/pacman/profile

1 0

[pacman-dev] [Build-Requirement] In configure.ac 'File3.8' with Seccomp is required.
by nly＠disroot.org 08 Jan '20

08 Jan '20

Steps: # Checkout source git clone <pacman-git> cd pacman git checkout v5.2.1 # Build <setup the build env> autoreconf -vif && ./configure --> Fail configure fails to find the latest versoin, 3.8, of `file'. This version 3.8 of `file' is not even available in the official Arch packages. Is it possible to build with an earlier version of `file'? File version 3.8 was released about a month ago. thanks, Amar

3 12

[pacman-dev] [PATCH] Include trailing slash in _alpm_mkdtemp
by Allan McRae 08 Jan '20

08 Jan '20

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/trans.c | 4 ++-- lib/libalpm/util.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index e4c8e404..50d80866 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -358,9 +358,9 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, } /* either extract or copy the scriptlet */ - len += strlen("/.INSTALL"); + len += strlen(".INSTALL"); MALLOC(scriptfn, len, free(tmpdir); RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(scriptfn, len, "%s/.INSTALL", tmpdir); + snprintf(scriptfn, len, "%s.INSTALL", tmpdir); if(is_archive) { if(_alpm_unpack_single(handle, filepath, tmpdir, ".INSTALL")) { retval = 1; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 514681d1..dacabdad 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -154,9 +154,10 @@ int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir) ASSERT(tmpdir != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, 0)); - len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; + len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX/") + 1; MALLOC(*tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, 0)); snprintf(*tmpdir, len, "%stmp/", handle->root); + if(access(*tmpdir, F_OK) != 0) { _alpm_makepath_mode(*tmpdir, 01777); } @@ -167,6 +168,9 @@ int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir) return 0; } + (*tmpdir)[len - 2] = '/'; + (*tmpdir)[len - 1] = '\0'; + return len; } -- 2.24.1

2 4

[pacman-dev] [PATCH] Move creating a temporary directory into a utility function
by Allan McRae 08 Jan '20

08 Jan '20

--- This will be used for downloading sync directories into a temporary location so they can be validated before replacing exisiting sync dbs. lib/libalpm/trans.c | 11 +---------- lib/libalpm/util.c | 28 ++++++++++++++++++++++++++++ lib/libalpm/util.h | 1 + 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 14f7d5e3..e4c8e404 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -353,16 +353,7 @@ int _alpm_runscriptlet(alpm_handle_t *handle, const char *filepath, strcpy(arg1, "-c"); /* create a directory in $root/tmp/ for copying/extracting the scriptlet */ - len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; - MALLOC(tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, -1)); - snprintf(tmpdir, len, "%stmp/", handle->root); - if(access(tmpdir, F_OK) != 0) { - _alpm_makepath_mode(tmpdir, 01777); - } - snprintf(tmpdir, len, "%stmp/alpm_XXXXXX", handle->root); - if(mkdtemp(tmpdir) == NULL) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); - free(tmpdir); + if((len = _alpm_mkdtemp(handle, &tmpdir)) == 0) { return 1; } diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index d12a4403..0ec9f650 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -142,6 +142,34 @@ done: return ret; } + +/** Creates a temporary directory of form /$root/tmp/alpm_XXXXXX. + * @param handle the context handle + * @param tmpdir pointer to storage of created directory path + * @return path length on success, 0 on error + */ +int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir) +{ + size_t len; + + ASSERT(tmpdir, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, 0)); + + len = strlen(handle->root) + strlen("tmp/alpm_XXXXXX") + 1; + MALLOC(*tmpdir, len, RET_ERR(handle, ALPM_ERR_MEMORY, 0)); + snprintf(*tmpdir, len, "%stmp/", handle->root); + if(access(*tmpdir, F_OK) != 0) { + _alpm_makepath_mode(*tmpdir, 01777); + } + snprintf(*tmpdir, len, "%stmp/alpm_XXXXXX", handle->root); + if(mkdtemp(*tmpdir) == NULL) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not create temp directory\n")); + free(tmpdir); + return 0; + } + + return len; +} + /** Copies a file. * @param src file path to copy from * @param dest file path to copy to diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 71dadc2c..12c7fbc7 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -111,6 +111,7 @@ struct archive_read_buffer { int _alpm_makepath(const char *path); int _alpm_makepath_mode(const char *path, mode_t mode); +int _alpm_mkdtemp(alpm_handle_t *handle, char **tmpdir); int _alpm_copyfile(const char *src, const char *dest); size_t _alpm_strip_newline(char *str, size_t len); -- 2.24.1

1 1

[pacman-dev] [PATCH] tests: Fix typo in test description
by Allan McRae 08 Jan '20

08 Jan '20

--- .../tests/sync-update-package-removing-required-provides.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pacman/tests/sync-update-package-removing-required-provides.py b/test/pacman/tests/sync-update-package-removing-required-provides.py index 19bfd922..2254e112 100644 --- a/test/pacman/tests/sync-update-package-removing-required-provides.py +++ b/test/pacman/tests/sync-update-package-removing-required-provides.py @@ -1,4 +1,4 @@ -self.description = "Upgrade a package that loose a provides entry which moves to a dedicated package" +self.description = "Upgrade a package that loses a provides entry which moves to a dedicated package" lp1 = pmpkg("pkg1", "1-1") lp1.provides = ["feature=1"] -- 2.24.1

1 0