- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH][WIP] Allow replacing libcrypto with libnettle in pacman
by Allan McRae 11 Oct '16

11 Oct '16

Add a --with-nettle configure option that directs pacman to use the libnettle hashing functions. Only one of the --with-libssl and --with-nettle configure options can be specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I did not write this - it is based heavily off a patch submitted to flyspray. I will change the author information once it is provided. Current caveats: 1) openssl is still used in makepkg. This was also addressed in the original patch, but needs work 2) to use libnettle, you need to use --with-nettle --without-libssl due to setting openssl usage to be the default. I'm not sure how I should address that. configure.ac | 38 ++++++++++++++++++++++++++++++-------- lib/libalpm/Makefile.am | 6 ++++-- lib/libalpm/libalpm.pc.in | 2 +- lib/libalpm/util.c | 41 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 74 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index f6b87e5..625ba68 100644 --- a/configure.ac +++ b/configure.ac @@ -120,10 +120,15 @@ AC_ARG_WITH(ldconfig, [set the full path to ldconfig]), [LDCONFIG=$withval], [LDCONFIG=/sbin/ldconfig]) -# Help line for using OpenSSL +# Help line for using OpenSSL (enabled by default) AC_ARG_WITH(openssl, - AS_HELP_STRING([--with-openssl], [use OpenSSL crypto implementations instead of internal routines]), - [], [with_openssl=check]) + AS_HELP_STRING([--with-openssl], [use OpenSSL crypto implementations @<:@default=yes@:>@]), + [], [with_openssl=yes]) + +# Help line for using nettle (disabled by default) +AC_ARG_WITH(nettle, + AS_HELP_STRING([--with-nettle], [use nettle crypto implementations @<:@default=no@:>@]), + [], [with_nettle=no]) # Help line for using gpgme AC_ARG_WITH(gpgme, @@ -218,9 +223,19 @@ AC_CHECK_LIB([m], [fabs], , PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], , AC_MSG_ERROR([*** libarchive >= 2.8.0 is needed to compile pacman!])) +# Check if at least one crypto backend is selected +AS_IF([test "x$with_openssl" == "xno" -a "x$with_nettle" == "xno"], + [AC_MSG_ERROR([*** pacman requires at least one crypto library to be available])] +) + +# Check if exactly one crypto backend is selected +AS_IF([test "x$with_openssl" == "xyes" -a "x$with_nettle" == "xyes"], + [AC_MSG_ERROR([*** --with-openssl and --with-nettle are mutually exclusive.])] +) + # Check for OpenSSL have_openssl=no -if test "x$with_openssl" != "xno"; then +if test "x$with_openssl" == "xyes"; then PKG_CHECK_MODULES(LIBSSL, [libcrypto], [AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no) if test "x$have_openssl" = xno -a "x$with_openssl" = xyes; then @@ -229,10 +244,16 @@ if test "x$with_openssl" != "xno"; then fi AM_CONDITIONAL(HAVE_LIBSSL, [test "$have_openssl" = "yes"]) -# Ensure one library for generating checksums is present -if test "$have_openssl" != "yes"; then - AC_MSG_ERROR([*** no library for checksum generation found]) +# Check for nettle +have_nettle=no +if test "x$with_nettle" == "xyes"; then + PKG_CHECK_MODULES(NETTLE, [nettle], + [AC_DEFINE(HAVE_LIBNETTLE, 1, [Define whether to use nettle]) have_nettle=yes], have_nettle=no) + if test "x$have_nettle" = xno -a "x$with_nettle" = xyes; then + AC_MSG_ERROR([*** nettle support requested but libraries not found]) + fi fi +AM_CONDITIONAL(HAVE_LIBNETTLE, [test "$have_nettle" = "yes"]) # Check for libcurl have_libcurl=no @@ -542,7 +563,7 @@ ${PACKAGE_NAME}: compiler : ${CC} preprocessor flags : ${CPPFLAGS} compiler flags : ${WARNING_CFLAGS} ${CFLAGS} - library flags : ${LIBS} ${LIBSSL_LIBS} ${LIBARCHIVE_LIBS} ${LIBCURL_LIBS} ${GPGME_LIBS} + library flags : ${LIBS} ${LIBSSL_LIBS} ${NETTLE_LIBS} ${LIBARCHIVE_LIBS} ${LIBCURL_LIBS} ${GPGME_LIBS} linker flags : ${LDFLAGS} Architecture : ${CARCH} @@ -569,6 +590,7 @@ ${PACKAGE_NAME}: Use libcurl : ${have_libcurl} Use GPGME : ${have_gpgme} Use OpenSSL : ${have_openssl} + Use nettle : ${have_nettle} Run make in doc/ dir : ${wantdoc} ${asciidoc} Doxygen support : ${usedoxygen} debug support : ${debug} diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 945a612..f4f20e6 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -65,13 +65,15 @@ libalpm_la_CFLAGS = \ $(GPGME_CFLAGS) \ $(LIBARCHIVE_CFLAGS) \ $(LIBCURL_CFLAGS) \ - $(LIBSSL_CFLAGS) + $(LIBSSL_CFLAGS) \ + $(NETTLE_CFLAGS) libalpm_la_LIBADD = \ $(LTLIBINTL) \ $(GPGME_LIBS) \ $(LIBARCHIVE_LIBS) \ $(LIBCURL_LIBS) \ - $(LIBSSL_LIBS) + $(LIBSSL_LIBS) \ + $(NETTLE_LIBS) # vim:set noet: diff --git a/lib/libalpm/libalpm.pc.in b/lib/libalpm/libalpm.pc.in index e4be174..e1d74ef 100644 --- a/lib/libalpm/libalpm.pc.in +++ b/lib/libalpm/libalpm.pc.in @@ -9,4 +9,4 @@ URL: http://www.archlinux.org/pacman/ Version: @LIB_VERSION@ Cflags: -I${includedir} @LFS_CFLAGS@ Libs: -L${libdir} -lalpm -Libs.private: @LIBS@ @LIBARCHIVE_LIBS@ @LIBSSL_LIBS@ @LIBCURL_LIBS@ @GPGME_LIBS@ +Libs.private: @LIBS@ @LIBARCHIVE_LIBS@ @LIBSSL_LIBS@ @NETTLE_LIBS@ @LIBCURL_LIBS@ @GPGME_LIBS@ diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 7ef4bf3..d0b9097 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -42,6 +42,11 @@ #include <openssl/sha.h> #endif +#ifdef HAVE_LIBNETTLE +#include <nettle/md5.h> +#include <nettle/sha2.h> +#endif + /* libalpm */ #include "util.h" #include "log.h" @@ -856,7 +861,7 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) return cachedir; } -#ifdef HAVE_LIBSSL +#if defined HAVE_LIBSSL || defined HAVE_LIBNETTLE /** Compute the MD5 message digest of a file. * @param path file path of file to compute MD5 digest of * @param output string to hold computed MD5 digest @@ -864,7 +869,11 @@ const char *_alpm_filecache_setup(alpm_handle_t *handle) */ static int md5_file(const char *path, unsigned char output[16]) { +#if HAVE_LIBSSL MD5_CTX ctx; +#else /* HAVE_LIBNETTLE */ + struct md5_ctx ctx; +#endif unsigned char *buf; ssize_t n; int fd; @@ -877,13 +886,21 @@ static int md5_file(const char *path, unsigned char output[16]) return 1; } +#if HAVE_LIBSSL MD5_Init(&ctx); +#else /* HAVE_LIBNETTLE */ + md5_init(&ctx); +#endif while((n = read(fd, buf, ALPM_BUFFER_SIZE)) > 0 || errno == EINTR) { if(n < 0) { continue; } +#if HAVE_LIBSSL MD5_Update(&ctx, buf, n); +#else /* HAVE_LIBNETTLE */ + md5_update(&ctx, n, buf); +#endif } close(fd); @@ -893,7 +910,11 @@ static int md5_file(const char *path, unsigned char output[16]) return 2; } +#if HAVE_LIBSSL MD5_Final(output, &ctx); +#else /* HAVE_LIBNETTLE */ + md5_digest(&ctx, MD5_DIGEST_SIZE, output); +#endif return 0; } @@ -904,7 +925,11 @@ static int md5_file(const char *path, unsigned char output[16]) */ static int sha256_file(const char *path, unsigned char output[32]) { +#if HAVE_LIBSSL SHA256_CTX ctx; +#else /* HAVE_LIBNETTLE */ + struct sha256_ctx ctx; +#endif unsigned char *buf; ssize_t n; int fd; @@ -917,13 +942,21 @@ static int sha256_file(const char *path, unsigned char output[32]) return 1; } +#if HAVE_LIBSSL SHA256_Init(&ctx); +#else /* HAVE_LIBNETTLE */ + sha256_init(&ctx); +#endif while((n = read(fd, buf, ALPM_BUFFER_SIZE)) > 0 || errno == EINTR) { if(n < 0) { continue; } +#if HAVE_LIBSSL SHA256_Update(&ctx, buf, n); +#else /* HAVE_LIBNETTLE */ + sha256_update(&ctx, n, buf); +#endif } close(fd); @@ -933,10 +966,14 @@ static int sha256_file(const char *path, unsigned char output[32]) return 2; } +#if HAVE_LIBSSL SHA256_Final(output, &ctx); +#else /* HAVE_LIBNETTLE */ + sha256_digest(&ctx, SHA256_DIGEST_SIZE, output); +#endif return 0; } -#endif +#endif /* HAVE_LIBSSL || HAVE_LIBNETTLE */ /** Create a string representing bytes in hexadecimal. * @param bytes the bytes to represent in hexadecimal -- 2.10.0

2 2

[pacman-dev] [PATCH][WIP] Use coreutils binaries for checking/generating checksums
by Allan McRae 11 Oct '16

11 Oct '16

If pacman is build against a crypto library other than openssl, it makes no sense to require makepkg to use it. The only currently considered alternative to openssl is nettle, which has no binary for base64 encode/decode. This means that we could replace the hashing cacluations with nettle-hash, but would require base64 from coreutils. Given makepkg already relies heavily on coreutils, we might as well use all the coreutils hashing binaries too. This patch also improves the checking of required binaries for hashing operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This joins the previous patch to enable building pacman against different crypto libraries. .../libmakepkg/integrity/generate_checksum.sh.in | 9 ++------ scripts/libmakepkg/integrity/verify_checksum.sh.in | 4 ++-- scripts/makepkg.sh.in | 24 ++++++++++++++-------- scripts/repo-add.sh.in | 16 +++++++-------- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/scripts/libmakepkg/integrity/generate_checksum.sh.in b/scripts/libmakepkg/integrity/generate_checksum.sh.in index 7a56710..6209ec2 100644 --- a/scripts/libmakepkg/integrity/generate_checksum.sh.in +++ b/scripts/libmakepkg/integrity/generate_checksum.sh.in @@ -59,8 +59,8 @@ generate_one_checksum() { if [[ $netfile != *.@(sig?(n)|asc) ]]; then local file file="$(get_filepath "$netfile")" || missing_source_file "$netfile" - sum="$(openssl dgst -${integ} "$file")" - sum=${sum##* } + sum="$("${integ}sum" "$file")" + sum=${sum% *} else sum="SKIP" fi @@ -80,11 +80,6 @@ generate_one_checksum() { generate_checksums() { msg "$(gettext "Generating checksums for source files...")" - if ! type -p openssl >/dev/null; then - error "$(gettext "Cannot find the %s binary required for generating sourcefile checksums.")" "openssl" - exit 1 # $E_MISSING_PROGRAM - fi - local integlist if (( $# == 0 )); then IFS=$'\n' read -rd '' -a integlist < <(get_integlist) diff --git a/scripts/libmakepkg/integrity/verify_checksum.sh.in b/scripts/libmakepkg/integrity/verify_checksum.sh.in index 44a2b2e..2d62455 100644 --- a/scripts/libmakepkg/integrity/verify_checksum.sh.in +++ b/scripts/libmakepkg/integrity/verify_checksum.sh.in @@ -82,8 +82,8 @@ verify_integrity_one() { return 1 fi - local realsum="$(openssl dgst -${integ} "$file")" - realsum="${realsum##* }" + local realsum="$("${integ}sum" "$file")" + realsum="${realsum% *}" if [[ ${expectedsum,,} = "$realsum" ]]; then printf '%s\n' "$(gettext "Passed")" >&2 else diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 82c9367..69a99a5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -28,7 +28,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # awk, bsdtar (libarchive), bzip2, coreutils, fakeroot, file, find (findutils), -# gettext, gpg, grep, gzip, openssl, sed, tput (ncurses), xz +# gettext, gpg, grep, gzip, sed, tput (ncurses), xz # gettext initialization export TEXTDOMAIN='pacman-scripts' @@ -658,8 +658,8 @@ write_buildinfo() { printf "builddir = %s\n" "${BUILDDIR}" - local sum="$(openssl dgst -sha256 "${BUILDFILE}")" - sum=${sum##* } + local sum="$(sha256sum "${BUILDFILE}")" + sum=${sum% *} printf "pkgbuild_sha256sum = %s\n" $sum @@ -1022,12 +1022,18 @@ check_software() { fi fi - # openssl - checksum operations - if (( ! SKIPCHECKSUMS )); then - if ! type -p openssl >/dev/null; then - error "$(gettext "Cannot find the %s binary required for validating source file checksums.")" "openssl" - ret=1 - fi + # checksum operations + if (( GENINTEG || ! SKIPCHECKSUMS )); then + local integlist + IFS=$'\n' read -rd '' -a integlist < <(get_integlist) + + local integ + for integ in "${integlist[@]}"; do + if ! type -p "${integ}sum" >/dev/null; then + error "$(gettext "Cannot find the %s binary required for source file checksums operations.")" "${integ}sum" + ret=1 + fi + done fi # distcc - compilation with distcc diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4da2c31..b1464e9 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -151,8 +151,8 @@ db_write_delta() { echo -e "%DELTAS%" >"$deltas" fi # get md5sum and compressed size of package - md5sum=$(openssl dgst -md5 "$deltafile") - md5sum=${md5sum##* } + md5sum=$(md5sum "$deltafile") + md5sum=${md5sum% *} csize=$(@SIZECMD@ -L "$deltafile") oldfile=$(xdelta3 printhdr "$deltafile" | grep "XDELTA filename (source)" | sed 's/.*: *//') @@ -374,17 +374,17 @@ db_write_entry() { return 1 fi msg2 "$(gettext "Adding package signature...")" - pgpsig=$(openssl base64 -in "$pkgfile.sig" | tr -d '\n') + pgpsig=$(base64 "$pkgfile.sig" | tr -d '\n') fi csize=$(@SIZECMD@ -L "$pkgfile") # compute checksums msg2 "$(gettext "Computing checksums...")" - md5sum=$(openssl dgst -md5 "$pkgfile") - md5sum=${md5sum##* } - sha256sum=$(openssl dgst -sha256 "$pkgfile") - sha256sum=${sha256sum##* } + md5sum=$(md5sum "$pkgfile") + md5sum=${md5sum% *} + sha256sum=$(sha256sum "$pkgfile") + sha256sum=${sha256sum% *} # remove an existing entry if it exists, ignore failures db_remove_entry "$pkgname" @@ -501,7 +501,7 @@ elephant() { "ZL9JFFZeAa0a2+lKjL2anpYfV+0Zx9LJ+/MC8nRayuDlSNy2rfAPibOzsiWHL0jL" \ "SsjFAQAA" ;; - esac | openssl base64 -d | gzip -d + esac | base64 -d | gzip -d } prepare_repo_db() { -- 2.10.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-84-gad27aa3
by allan＠archlinux.org 11 Oct '16

11 Oct '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via ad27aa30fbcac7a07586072d29d3db50009994e9 (commit) via e2b4e220bcb6d3770716fb000953aa729ed07989 (commit) via 0c99eabd50752310f42ec808c8734a338122ec86 (commit) via 2e76c184aac74c4848fa5ee092fe54c9954c4054 (commit) via d590a45795b30a14cdb697754749c85907053570 (commit) via 3190b87b65b038ce31a37f99fb058f3160007cbb (commit) via 87ee9693bd70ad5b17b9542fa67a1a58cd0f7c29 (commit) via 05e1b8de1a96526c4e59745e7e4dc4a83a6383dd (commit) from 0d2ba870c96d1b4b3d5fabfabe303bc6b1c989fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ad27aa30fbcac7a07586072d29d3db50009994e9 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Oct 11 15:37:13 2016 +1000 Ensure makepkg-wrapper is built after makepkg makepkg-wrapper did not get rebuilt if makepkg was regenerated due to library changes. Ensure makepkg-wrapper is always generated and linked any time makepkg changes. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e2b4e220bcb6d3770716fb000953aa729ed07989 Author: Christian Hesse <mail(a)eworm.de> Date: Tue Oct 4 10:21:11 2016 +0200 lint_pkgbuild/pkgname: pkgname is not allowed to be empty We checked for empty array elements, but did not catch empty array. Add a check for that case as well. Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0c99eabd50752310f42ec808c8734a338122ec86 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 9 22:52:27 2016 +1000 Remove contrib The contrib directory takes too much of the pacman developer's limited time, which could be better spent developing and reviewing patches for the primary projects. The community can pick this up in a separate repository if wanted. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2e76c184aac74c4848fa5ee092fe54c9954c4054 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 9 22:21:45 2016 +1000 Move bash/zsh completion out of contrib Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d590a45795b30a14cdb697754749c85907053570 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 1 23:13:59 2016 +1000 Remove pacman-optimize The people who believe that pacman-optimize is actually doing something useful are the same people who are voting for Trump. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3190b87b65b038ce31a37f99fb058f3160007cbb Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Fri Sep 30 00:57:34 2016 +0200 fix --printsrcinfo unify arch and non-arch specific variables This fixes the issue with --printsrcinfo that all arch specific variants of a variable get merged into their non arch specific variant. The .SRCINFO file ends up having $depends containing $depends_x86_64 and omitting the latter. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 87ee9693bd70ad5b17b9542fa67a1a58cd0f7c29 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 25 19:30:51 2016 +1000 Remove SHA224 support This was included due to use of PolarSSL's implementation for our internal SHA2 support. As our internal checksum calculations are now removed, we can also remove this unused code path. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 05e1b8de1a96526c4e59745e7e4dc4a83a6383dd Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 25 19:10:03 2016 +1000 Remove internal md5 and sha2 implementations The internal implementations for md5 and sha256 checksums have not been merged from upstream sources for a long time. Instead of us carrying copies of code from other projects, we should just support building against multiple libraries that provide such functionality. This patch removes the md5 and sha2 code (originally obtained from PolarSSL) from our repository. The configure script will now error unless at least one library supporting checksum generation is present, with the only library currently supported being openssl. It will be relatively simple for other such libraries (e.g. nettle) to be supported if anyone wishes to add them. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- configure.ac | 7 +- contrib/.gitignore | 12 - contrib/Makefile.am | 113 ------ contrib/PKGBUILD.vim | 320 ----------------- contrib/README | 41 --- contrib/bacman.sh.in | 391 --------------------- contrib/checkupdates.sh.in | 59 ---- contrib/doc/.gitignore | 2 - contrib/doc/Makefile.am | 60 ---- contrib/doc/asciidoc.conf | 1 - contrib/doc/bacman.8.txt | 67 ---- contrib/doc/footer.txt | 1 - contrib/doc/verify-pacman-repo-db.1.txt | 60 ---- contrib/paccache.sh.in | 366 ------------------- contrib/pacdiff.sh.in | 194 ---------- contrib/paclist.sh.in | 68 ---- contrib/paclog-pkglist.sh.in | 99 ------ contrib/pacscripts.sh.in | 140 -------- contrib/pacsearch.in | 125 ------- contrib/rankmirrors.sh.in | 234 ------------ contrib/updpkgsums.sh.in | 115 ------ contrib/verify-pacman-repo-db.pl | 259 -------------- contrib/vimprojects | 25 -- lib/libalpm/Makefile.am | 6 - lib/libalpm/md5.c | 333 ------------------ lib/libalpm/md5.h | 60 ---- lib/libalpm/sha2.c | 370 ------------------- lib/libalpm/sha2.h | 65 ---- lib/libalpm/util.c | 35 +- scripts/.gitignore | 1 - scripts/Makefile.am | 42 ++- scripts/completion/.gitignore | 2 + {contrib => scripts/completion}/bash_completion.in | 0 {contrib => scripts/completion}/zsh_completion.in | 0 scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 5 + scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 189 ---------- scripts/po/POTFILES.in | 1 - 39 files changed, 52 insertions(+), 3820 deletions(-) delete mode 100644 contrib/.gitignore delete mode 100644 contrib/Makefile.am delete mode 100644 contrib/PKGBUILD.vim delete mode 100644 contrib/README delete mode 100644 contrib/bacman.sh.in delete mode 100644 contrib/checkupdates.sh.in delete mode 100644 contrib/doc/.gitignore delete mode 100644 contrib/doc/Makefile.am delete mode 120000 contrib/doc/asciidoc.conf delete mode 100644 contrib/doc/bacman.8.txt delete mode 120000 contrib/doc/footer.txt delete mode 100644 contrib/doc/verify-pacman-repo-db.1.txt delete mode 100644 contrib/paccache.sh.in delete mode 100644 contrib/pacdiff.sh.in delete mode 100644 contrib/paclist.sh.in delete mode 100644 contrib/paclog-pkglist.sh.in delete mode 100644 contrib/pacscripts.sh.in delete mode 100644 contrib/pacsearch.in delete mode 100644 contrib/rankmirrors.sh.in delete mode 100644 contrib/updpkgsums.sh.in delete mode 100755 contrib/verify-pacman-repo-db.pl delete mode 100644 contrib/vimprojects delete mode 100644 lib/libalpm/md5.c delete mode 100644 lib/libalpm/md5.h delete mode 100644 lib/libalpm/sha2.c delete mode 100644 lib/libalpm/sha2.h create mode 100644 scripts/completion/.gitignore rename {contrib => scripts/completion}/bash_completion.in (100%) rename {contrib => scripts/completion}/zsh_completion.in (100%) delete mode 100644 scripts/pacman-optimize.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Ensure makepkg-wrapper is built after makepkg
by Allan McRae 11 Oct '16

11 Oct '16

makepkg-wrapper did not get rebuilt if makepkg was regenerated due to library changes. Ensure makepkg-wrapper is always generated and linked any time makepkg changes. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8278b6f..92cd50c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -214,11 +214,8 @@ repo-elephant: $(srcdir)/repo-add.sh.in $(AM_V_at)$(LN_S) repo-add repo-elephant makepkg-wrapper: \ - Makefile \ - $(srcdir)/makepkg-wrapper.sh.in \ - $(srcdir)/makepkg.sh.in \ - $(srcdir)/library/parseopts.sh \ - | makepkg + makepkg + $(AM_V_at)$(MKDIR_P) .lib $(AM_V_at)mv -f makepkg .lib $(AM_V_at)$(RM) $@ -- 2.10.0

1 0

[pacman-dev] [PATCH] Remove contrib
by Allan McRae 10 Oct '16

10 Oct '16

The contrib directory takes too much of the pacman developer's limited time, which could be better spent developing and reviewing patches for the primary projects. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Various stuff in src/util can also die. Makefile.am | 2 +- configure.ac | 2 - contrib/.gitignore | 12 - contrib/Makefile.am | 113 ----- contrib/PKGBUILD.vim | 320 -------------- contrib/README | 41 -- contrib/bacman.sh.in | 391 ----------------- contrib/bash_completion.in | 156 ------- contrib/checkupdates.sh.in | 59 --- contrib/doc/.gitignore | 2 - contrib/doc/Makefile.am | 60 --- contrib/doc/asciidoc.conf | 1 - contrib/doc/bacman.8.txt | 67 --- contrib/doc/footer.txt | 1 - contrib/doc/verify-pacman-repo-db.1.txt | 60 --- contrib/paccache.sh.in | 366 ---------------- contrib/pacdiff.sh.in | 194 --------- contrib/paclist.sh.in | 68 --- contrib/paclog-pkglist.sh.in | 99 ----- contrib/pacscripts.sh.in | 140 ------- contrib/pacsearch.in | 125 ------ contrib/rankmirrors.sh.in | 234 ----------- contrib/updpkgsums.sh.in | 115 ----- contrib/verify-pacman-repo-db.pl | 259 ------------ contrib/vimprojects | 25 -- contrib/zsh_completion.in | 723 -------------------------------- 26 files changed, 1 insertion(+), 3634 deletions(-) delete mode 100644 contrib/.gitignore delete mode 100644 contrib/Makefile.am delete mode 100644 contrib/PKGBUILD.vim delete mode 100644 contrib/README delete mode 100644 contrib/bacman.sh.in delete mode 100644 contrib/bash_completion.in delete mode 100644 contrib/checkupdates.sh.in delete mode 100644 contrib/doc/.gitignore delete mode 100644 contrib/doc/Makefile.am delete mode 120000 contrib/doc/asciidoc.conf delete mode 100644 contrib/doc/bacman.8.txt delete mode 120000 contrib/doc/footer.txt delete mode 100644 contrib/doc/verify-pacman-repo-db.1.txt delete mode 100644 contrib/paccache.sh.in delete mode 100644 contrib/pacdiff.sh.in delete mode 100644 contrib/paclist.sh.in delete mode 100644 contrib/paclog-pkglist.sh.in delete mode 100644 contrib/pacscripts.sh.in delete mode 100644 contrib/pacsearch.in delete mode 100644 contrib/rankmirrors.sh.in delete mode 100644 contrib/updpkgsums.sh.in delete mode 100755 contrib/verify-pacman-repo-db.pl delete mode 100644 contrib/vimprojects delete mode 100644 contrib/zsh_completion.in diff --git a/Makefile.am b/Makefile.am index a676878..f4ff187 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ if WANT_DOC SUBDIRS += doc endif -DIST_SUBDIRS = $(SUBDIRS) contrib src/common +DIST_SUBDIRS = $(SUBDIRS) src/common ACLOCAL_AMFLAGS = -I m4 --install AM_MAKEFLAGS = --no-print-directory diff --git a/configure.ac b/configure.ac index ae017d1..f6b87e5 100644 --- a/configure.ac +++ b/configure.ac @@ -523,8 +523,6 @@ test/pacman/Makefile test/pacman/tests/Makefile test/scripts/Makefile test/util/Makefile -contrib/Makefile -contrib/doc/Makefile Makefile ]) AC_OUTPUT diff --git a/contrib/.gitignore b/contrib/.gitignore deleted file mode 100644 index 8a32b41..0000000 diff --git a/contrib/Makefile.am b/contrib/Makefile.am deleted file mode 100644 index 897cd85..0000000 diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim deleted file mode 100644 index 110bbc7..0000000 diff --git a/contrib/README b/contrib/README deleted file mode 100644 index befd3c1..0000000 diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in deleted file mode 100644 index 39fbe99..0000000 diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in deleted file mode 100644 index 06963c4..0000000 diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in deleted file mode 100644 index ff62891..0000000 diff --git a/contrib/doc/.gitignore b/contrib/doc/.gitignore deleted file mode 100644 index 3ab2035..0000000 diff --git a/contrib/doc/Makefile.am b/contrib/doc/Makefile.am deleted file mode 100644 index d5725b1..0000000 diff --git a/contrib/doc/asciidoc.conf b/contrib/doc/asciidoc.conf deleted file mode 120000 index ff9653d..0000000 diff --git a/contrib/doc/bacman.8.txt b/contrib/doc/bacman.8.txt deleted file mode 100644 index dc5af48..0000000 diff --git a/contrib/doc/footer.txt b/contrib/doc/footer.txt deleted file mode 120000 index 9dd4bae..0000000 diff --git a/contrib/doc/verify-pacman-repo-db.1.txt b/contrib/doc/verify-pacman-repo-db.1.txt deleted file mode 100644 index 62564b8..0000000 diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in deleted file mode 100644 index 02fae52..0000000 diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in deleted file mode 100644 index dff2115..0000000 diff --git a/contrib/paclist.sh.in b/contrib/paclist.sh.in deleted file mode 100644 index f4fd540..0000000 diff --git a/contrib/paclog-pkglist.sh.in b/contrib/paclog-pkglist.sh.in deleted file mode 100644 index 847b389..0000000 diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in deleted file mode 100644 index 4a1e0c5..0000000 diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in deleted file mode 100644 index a89328d..0000000 diff --git a/contrib/rankmirrors.sh.in b/contrib/rankmirrors.sh.in deleted file mode 100644 index 7b50eb2..0000000 diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in deleted file mode 100644 index c571d29..0000000 diff --git a/contrib/verify-pacman-repo-db.pl b/contrib/verify-pacman-repo-db.pl deleted file mode 100755 index e0a5410..0000000 diff --git a/contrib/vimprojects b/contrib/vimprojects deleted file mode 100644 index e9adfdf..0000000 diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in deleted file mode 100644 index f74fa29..0000000 -- 2.10.0

6 7

[pacman-dev] [PATCH v4] makepkg: Move parseopts from library to libmakepkg
by Alad Wenter 10 Oct '16

10 Oct '16

parseopts is used in makepkg and other scripts such as pacman-key as a getopt replacement. Instead of including it in those scripts via a macro, move it to libmakepkg/util/parseopts.sh and have scripts source this file where appropriate. To keep the parseopts test, a new variable was introduced: PM_LIBMAKEPKG_DIR Signed-off-by: Alad Wenter <alad(a)archlinux.info> --- v4: - move to new file util/parseopts.sh - only source this file - do not touch .po files Makefile.am | 3 +- scripts/Makefile.am | 9 +--- scripts/{library => libmakepkg/util}/parseopts.sh | 50 +++++++++++++++++++---- scripts/makepkg.sh.in | 2 - scripts/pacman-db-upgrade.sh.in | 5 ++- scripts/pacman-key.sh.in | 7 +++- scripts/pkgdelta.sh.in | 7 +++- scripts/po/POTFILES.in | 2 +- test/scripts/parseopts_test.sh | 2 +- 9 files changed, 64 insertions(+), 23 deletions(-) rename scripts/{library => libmakepkg/util}/parseopts.sh (56%) diff --git a/Makefile.am b/Makefile.am index a676878..f58344a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,8 @@ TEST_EXTENSIONS = .py AM_TESTS_ENVIRONMENT = \ PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \ PMTEST_SCRIPT_DIR=$(top_builddir)/scripts/; export PMTEST_SCRIPT_DIR; \ - PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; + PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; \ + PMTEST_LIBMAKEPKG_DIR=$(top_builddir)/scripts/libmakepkg/; export PMTEST_LIBMAKEPKG_DIR; LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e4f9fb1..339b8ba 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -33,7 +33,6 @@ EXTRA_DIST = \ LIBRARY = \ library/output_format.sh \ - library/parseopts.sh \ library/human_to_size.sh \ library/size_to_human.sh \ library/term_colors.sh @@ -162,7 +161,6 @@ $(LIBMAKEPKG_IN): %: %.in Makefile makepkg: \ $(srcdir)/makepkg.sh.in \ $(srcdir)/makepkg-wrapper.sh.in \ - $(srcdir)/library/parseopts.sh \ $(LIBMAKEPKG_IN) makepkg-template: \ @@ -179,8 +177,7 @@ pacman-db-upgrade: \ pacman-key: \ $(srcdir)/pacman-key.sh.in \ - $(srcdir)/library/output_format.sh \ - $(srcdir)/library/parseopts.sh + $(srcdir)/library/output_format.sh pacman-optimize: \ $(srcdir)/pacman-optimize.sh.in \ @@ -188,8 +185,7 @@ pacman-optimize: \ pkgdelta: \ $(srcdir)/pkgdelta.sh.in \ - $(srcdir)/library/output_format.sh \ - $(srcdir)/library/parseopts.sh + $(srcdir)/library/output_format.sh repo-add: \ $(srcdir)/repo-add.sh.in \ @@ -207,7 +203,6 @@ makepkg-wrapper: \ Makefile \ $(srcdir)/makepkg-wrapper.sh.in \ $(srcdir)/makepkg.sh.in \ - $(srcdir)/library/parseopts.sh \ | makepkg $(AM_V_at)$(MKDIR_P) .lib $(AM_V_at)mv -f makepkg .lib diff --git a/scripts/library/parseopts.sh b/scripts/libmakepkg/util/parseopts.sh similarity index 56% rename from scripts/library/parseopts.sh rename to scripts/libmakepkg/util/parseopts.sh index cf6aa6c..802275e 100644 --- a/scripts/library/parseopts.sh +++ b/scripts/libmakepkg/util/parseopts.sh @@ -1,4 +1,40 @@ -# getopt-like parser +#!/bin/bash +# +# parseopts.sh - getopt_long-like parser +# +# Copyright (c) 2012-2016 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# A getopt_long-like parser which portably supports longopts and +# shortopts with some GNU extensions. It does not allow for options +# with optional arguments. For both short and long opts, options +# requiring an argument should be suffixed with a colon. After the +# first argument containing the short opts, any number of valid long +# opts may be be passed. The end of the options delimiter must then be +# added, followed by the user arguments to the calling program. +# +# Recommended Usage: +# OPT_SHORT='fb:z' +# OPT_LONG=('foo' 'bar:' 'baz') +# if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then +# exit 1 +# fi +# set -- "${OPTRET[@]}" +# Returns: +# 0: parse success +# 1: parse failure (error message supplied) parseopts() { local opt= optarg= i= shortopts=$1 local -a longopts=() unused_argv=() @@ -34,7 +70,7 @@ parseopts() { return 255 ;; *) # fail, ambiguous match - printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" + printf "${0##*/}: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" printf " '%s'" "${longmatch[@]%:}" printf '\n' return 254 ;; @@ -53,7 +89,7 @@ parseopts() { # option doesn't exist if [[ $shortopts != *$opt* ]]; then - printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 + printf "${0##*/}: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 OPTRET=(--) return 1 fi @@ -72,7 +108,7 @@ parseopts() { break # parse failure else - printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + printf "${0##*/}: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 OPTRET=(--) return 1 fi @@ -86,7 +122,7 @@ parseopts() { 0) # parse failure if [[ $optarg ]]; then - printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 + printf "${0##*/}: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 OPTRET=(--) return 1 # --longopt @@ -104,7 +140,7 @@ parseopts() { shift # parse failure else - printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 + printf "${0##*/}: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 OPTRET=(--) return 1 fi @@ -116,7 +152,7 @@ parseopts() { ;; 255) # parse failure - printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 + printf "${0##*/}: $(gettext "invalid option") '--%s'\n" "$opt" >&2 OPTRET=(--) return 1 ;; diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..b3cafa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1153,8 +1153,6 @@ run_split_packaging() { pkgname=("${pkgname_backup[@]}") } -m4_include(library/parseopts.sh) - usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 79e1c59..62f4285 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -28,7 +28,10 @@ export TEXTDOMAINDIR='@localedir@' declare -r myver='@PACKAGE_VERSION@' -m4_include(library/output_format.sh) +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +# Import parseopts.sh +source "$LIBRARY"/util/parseopts.sh m4_include(library/parseopts.sh) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index ffefc68..81bea0b 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -26,6 +26,11 @@ export TEXTDOMAINDIR='@localedir@' declare -r myver="@PACKAGE_VERSION@" +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +# Import parseopts.sh +source "$LIBRARY"/util/parseopts.sh + # Options ADD=0 DELETE=0 @@ -50,8 +55,6 @@ DEFAULT_KEYSERVER='hkp://pool.sks-keyservers.net' m4_include(library/output_format.sh) -m4_include(library/parseopts.sh) - usage() { printf "pacman-key (pacman) %s\n" ${myver} echo diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index fe63974..9f87185 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -28,6 +28,12 @@ export TEXTDOMAINDIR='@localedir@' declare -r myver='@PACKAGE_VERSION@' +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +# Import parseopts.sh +source "$LIBRARY"/util/parseopts.sh + +# Options QUIET=0 USE_COLOR='y' @@ -41,7 +47,6 @@ max_delta_size=70 # ensure we have a sane umask set umask 0022 -m4_include(library/parseopts.sh) m4_include(library/output_format.sh) # print usage instructions diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 53dd545..81e3acd 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -50,6 +50,6 @@ scripts/libmakepkg/tidy/staticlibs.sh.in scripts/libmakepkg/tidy/strip.sh.in scripts/libmakepkg/tidy/zipman.sh.in scripts/libmakepkg/util/message.sh +scripts/libmakepkg/util/parseopts.sh scripts/libmakepkg/util/source.sh.in scripts/library/output_format.sh -scripts/library/parseopts.sh diff --git a/test/scripts/parseopts_test.sh b/test/scripts/parseopts_test.sh index a8738a4..a582198 100755 --- a/test/scripts/parseopts_test.sh +++ b/test/scripts/parseopts_test.sh @@ -3,7 +3,7 @@ source "$(dirname "$0")"/../tap.sh || exit 1 # source the library function -lib=${1:-${PMTEST_SCRIPTLIB_DIR}parseopts.sh} +lib=${1:-${PMTEST_LIBMAKEPKG_DIR}util/parseopts.sh} if [[ -z $lib || ! -f $lib ]]; then tap_bail "parseopts library ($lib) could not be located" exit 1 -- 2.10.0

1 0

[pacman-dev] [PATCH 1/1] lint_pkgbuild/pkgname: pkgname is not allowed to be empty
by Christian Hesse 10 Oct '16

10 Oct '16

From: Christian Hesse <mail(a)eworm.de> We checked for empty array elements, but did not catch empty array. Add a check for that case as well. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in index a044082..2696afa 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in @@ -32,6 +32,11 @@ lint_pkgbuild_functions+=('lint_pkgname') lint_pkgname() { local ret=0 i + if [[ -z "${pkgname[0]}" ]]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgname" + ret=1 + fi + for i in "${pkgname[@]}"; do if [[ -z $i ]]; then error "$(gettext "%s is not allowed to be empty.")" "pkgname" -- 2.10.0

3 4

[pacman-dev] [PATCH] Move bash/zsh completion out of contrib
by Allan McRae 10 Oct '16

10 Oct '16

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- The "remove contrib" patch has been rebased on top of this. contrib/Makefile.am | 22 ++-------------- scripts/Makefile.am | 29 +++++++++++++++++++++- scripts/completion/.gitignore | 2 ++ {contrib => scripts/completion}/bash_completion.in | 0 {contrib => scripts/completion}/zsh_completion.in | 0 5 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 scripts/completion/.gitignore rename {contrib => scripts/completion}/bash_completion.in (100%) rename {contrib => scripts/completion}/zsh_completion.in (100%) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 897cd85..73df92e 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -28,14 +28,9 @@ OURSCRIPTS = \ $(BASHSCRIPTS) \ $(OTHERSCRIPTS) -OURFILES = \ - bash_completion \ - zsh_completion - EXTRA_DIST = \ PKGBUILD.vim \ bacman.sh.in \ - bash_completion.in \ checkupdates.sh.in \ paccache.sh.in \ paclog-pkglist.sh.in \ @@ -46,11 +41,10 @@ EXTRA_DIST = \ rankmirrors.sh.in \ updpkgsums.sh.in \ vimprojects \ - zsh_completion.in \ README # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp +MOSTLYCLEANFILES = $(OURSCRIPTS) *.tmp if USE_GIT_VERSION GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//') @@ -85,20 +79,9 @@ $(OURFILES): Makefile $(AM_V_at)chmod a-w $@.tmp $(AM_V_at)mv $@.tmp $@ -all-am: $(OURSCRIPTS) $(OURFILES) - -install-data-local: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ - $(INSTALL_DATA) bash_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman - $(MKDIR_P) $(DESTDIR)$(datarootdir)/zsh/site-functions/ - $(INSTALL_DATA) zsh_completion $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman - -uninstall-local: - $(RM) $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman - $(RM) $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman +all-am: $(OURSCRIPTS) bacman: $(srcdir)/bacman.sh.in -bash_completion: $(srcdir)/bash_completion.in checkupdates: $(srcdir)/checkupdates.sh.in paccache: $(srcdir)/paccache.sh.in $(top_srcdir)/scripts/library/parseopts.sh $(top_srcdir)/scripts/library/size_to_human.sh pacdiff: $(srcdir)/pacdiff.sh.in @@ -108,6 +91,5 @@ pacscripts: $(srcdir)/pacscripts.sh.in pacsearch: $(srcdir)/pacsearch.in rankmirrors: $(srcdir)/rankmirrors.sh.in updpkgsums: $(srcdir)/updpkgsums.sh.in -zsh_completion: $(srcdir)/zsh_completion.in # vim:set noet: diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 8662496..8278b6f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = \ pacman-key.sh.in \ pkgdelta.sh.in \ repo-add.sh.in \ + $(COMPLETION_DIST) \ $(LIBRARY) \ $(LIBMAKEPKG_DIST) @@ -102,8 +103,15 @@ LIBMAKEPKG_DIST = \ $(LIBMAKEPKG) \ $(addsuffix .in, $(LIBMAKEPKG_IN)) +COMPLETION_IN = \ + completion/bash_completion \ + completion/zsh_completion + +COMPLETION_DIST = \ + $(addsuffix .in, $(COMPLETION_IN)) + # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = $(bin_SCRIPTS) $(LIBMAKEPKG_IN) +MOSTLYCLEANFILES = $(bin_SCRIPTS) $(LIBMAKEPKG_IN) $(COMPLETION_IN) clean-local: $(AM_V_at)$(RM) -r .lib @@ -157,6 +165,14 @@ $(LIBMAKEPKG_IN): %: %.in Makefile $(AM_V_at)chmod a-w $@ @$(BASH_SHELL) -O extglob -n $@ +$(COMPLETION_IN): %: %.in Makefile + $(AM_V_at)$(RM) $@ + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(edit) $(srcdir)/$@.in >$@ + $(AM_V_at)chmod a-w $@ + +all-am: $(COMPLETION_IN) + makepkg: \ $(srcdir)/makepkg.sh.in \ $(srcdir)/makepkg-wrapper.sh.in \ @@ -213,6 +229,16 @@ makepkg-wrapper: \ $(AM_V_at)chmod +x,a-w $@ $(AM_V_at)$(LN_S) makepkg-wrapper makepkg +install-data-local: + $(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/ + $(INSTALL_DATA) completion/bash_completion $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman + $(MKDIR_P) $(DESTDIR)$(datarootdir)/zsh/site-functions/ + $(INSTALL_DATA) completion/zsh_completion $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman + +uninstall-local: + $(RM) $(DESTDIR)$(sysconfdir)/bash_completion.d/pacman + $(RM) $(DESTDIR)$(datarootdir)/zsh/site-functions/_pacman + install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(RM) makepkg makepkg-wrapper @@ -247,4 +273,5 @@ uninstall-hook: $(RM) -r $(DESTDIR)$(libmakepkgdir)/$$dir; \ done + # vim:set noet: diff --git a/scripts/completion/.gitignore b/scripts/completion/.gitignore new file mode 100644 index 0000000..881bfd1 --- /dev/null +++ b/scripts/completion/.gitignore @@ -0,0 +1,2 @@ +bash_completion +zsh_completion diff --git a/contrib/bash_completion.in b/scripts/completion/bash_completion.in similarity index 100% rename from contrib/bash_completion.in rename to scripts/completion/bash_completion.in diff --git a/contrib/zsh_completion.in b/scripts/completion/zsh_completion.in similarity index 100% rename from contrib/zsh_completion.in rename to scripts/completion/zsh_completion.in -- 2.10.0

1 0

[pacman-dev] [PATCH v3 0/2] Move parseopts from library to makepkg
by Alad Wenter 08 Oct '16

08 Oct '16

v3: - account for tests (PM_LIBMAKEPKG_DIR) - fix other scripts (apart from contrib) - add commit messages - generate util/*.sh with make Note: parseopts uses $0 to get the script name inside the error message; BASH_SOURCE would display the name of the libmakepkg script. An other option is to set a fixed "argv0" variable in the various scripts, and refer to that from parseopts. Alad Wenter (2): makepkg: Move parseopts from library to libmakepkg libmakepkg: generate scripts in util Makefile.am | 3 +- scripts/Makefile.am | 14 +- .../libmakepkg/util/{message.sh => message.sh.in} | 0 scripts/libmakepkg/util/option.sh | 142 ---------- scripts/libmakepkg/util/option.sh.in | 299 +++++++++++++++++++++ scripts/libmakepkg/util/{util.sh => util.sh.in} | 0 scripts/library/README | 20 -- scripts/library/parseopts.sh | 137 ---------- scripts/makepkg.sh.in | 2 - scripts/pacman-db-upgrade.sh.in | 7 +- scripts/pacman-key.sh.in | 7 +- scripts/pkgdelta.sh.in | 9 +- scripts/po/POTFILES.in | 2 +- scripts/po/ar.po | 10 +- scripts/po/ast.po | 10 +- scripts/po/az_AZ.po | 10 +- scripts/po/bg.po | 10 +- scripts/po/br.po | 10 +- scripts/po/ca.po | 10 +- scripts/po/cs.po | 10 +- scripts/po/da.po | 10 +- scripts/po/de.po | 10 +- scripts/po/el.po | 10 +- scripts/po/en_GB.po | 10 +- scripts/po/eo.po | 10 +- scripts/po/es.po | 10 +- scripts/po/es_419.po | 10 +- scripts/po/eu.po | 10 +- scripts/po/fi.po | 10 +- scripts/po/fr.po | 10 +- scripts/po/gl.po | 10 +- scripts/po/hr.po | 10 +- scripts/po/hu.po | 10 +- scripts/po/id.po | 10 +- scripts/po/is.po | 10 +- scripts/po/it.po | 10 +- scripts/po/ja.po | 10 +- scripts/po/ka.po | 10 +- scripts/po/kk.po | 10 +- scripts/po/ko.po | 10 +- scripts/po/lt.po | 10 +- scripts/po/nb.po | 10 +- scripts/po/nl.po | 10 +- scripts/po/pacman-scripts.pot | 10 +- scripts/po/pl.po | 10 +- scripts/po/pt.po | 10 +- scripts/po/pt_BR.po | 10 +- scripts/po/ro.po | 10 +- scripts/po/ru.po | 10 +- scripts/po/sk.po | 10 +- scripts/po/sl.po | 10 +- scripts/po/sr.po | 10 +- scripts%2Fpo%2Fsr(a)latin.po | 10 +- scripts/po/sv.po | 10 +- scripts/po/tr.po | 10 +- scripts/po/uk.po | 10 +- scripts/po/uz.po | 10 +- scripts/po/zh_CN.po | 10 +- scripts/po/zh_TW.po | 10 +- test/scripts/parseopts_test.sh | 2 +- 60 files changed, 559 insertions(+), 545 deletions(-) rename scripts/libmakepkg/util/{message.sh => message.sh.in} (100%) delete mode 100644 scripts/libmakepkg/util/option.sh create mode 100644 scripts/libmakepkg/util/option.sh.in rename scripts/libmakepkg/util/{util.sh => util.sh.in} (100%) delete mode 100644 scripts/library/parseopts.sh -- 2.10.0

1 0

[pacman-dev] [PATCH v2] makepkg: Move parseopts from library to libmakepkg
by Alad Wenter 08 Oct '16

08 Oct '16

Signed-off-by: Alad Wenter <alad(a)archlinux.info> --- v2: Add missing signoff. scripts/libmakepkg/util/option.sh | 157 ++++++++++++++++++++++++++++++++++++++ scripts/library/README | 20 ----- scripts/library/parseopts.sh | 137 --------------------------------- scripts/makepkg.sh.in | 2 - 4 files changed, 157 insertions(+), 159 deletions(-) delete mode 100644 scripts/library/parseopts.sh diff --git a/scripts/libmakepkg/util/option.sh b/scripts/libmakepkg/util/option.sh index 54ba474..4d5fd78 100644 --- a/scripts/libmakepkg/util/option.sh +++ b/scripts/libmakepkg/util/option.sh @@ -140,3 +140,160 @@ check_buildoption() { # not found return 127 } + + +# parseopts.sh: +# A getopt_long-like parser which portably supports longopts and +# shortopts with some GNU extensions. It does not allow for options +# with optional arguments. For both short and long opts, options +# requiring an argument should be suffixed with a colon. After the +# first argument containing the short opts, any number of valid long +# opts may be be passed. The end of the options delimiter must then be +# added, followed by the user arguments to the calling program. +# +# Recommended Usage: +# OPT_SHORT='fb:z' +# OPT_LONG=('foo' 'bar:' 'baz') +# if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then +# exit 1 +# fi +# set -- "${OPTRET[@]}" +# Returns: +# 0: parse success +# 1: parse failure (error message supplied) +parseopts() { + local opt= optarg= i= shortopts=$1 + local -a longopts=() unused_argv=() + + shift + while [[ $1 && $1 != '--' ]]; do + longopts+=("$1") + shift + done + shift + + longoptmatch() { + local o longmatch=() + for o in "${longopts[@]}"; do + if [[ ${o%:} = "$1" ]]; then + longmatch=("$o") + break + fi + [[ ${o%:} = "$1"* ]] && longmatch+=("$o") + done + + case ${#longmatch[*]} in + 1) + # success, override with opt and return arg req (0 == none, 1 == required) + opt=${longmatch%:} + if [[ $longmatch = *: ]]; then + return 1 + else + return 0 + fi ;; + 0) + # fail, no match found + return 255 ;; + *) + # fail, ambiguous match + printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" + printf " '%s'" "${longmatch[@]%:}" + printf '\n' + return 254 ;; + esac >&2 + } + + while (( $# )); do + case $1 in + --) # explicit end of options + shift + break + ;; + -[!-]*) # short option + for (( i = 1; i < ${#1}; i++ )); do + opt=${1:i:1} + + # option doesn't exist + if [[ $shortopts != *$opt* ]]; then + printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + + OPTRET+=("-$opt") + # option requires optarg + if [[ $shortopts = *$opt:* ]]; then + # if we're not at the end of the option chunk, the rest is the optarg + if (( i < ${#1} - 1 )); then + OPTRET+=("${1:i+1}") + break + # if we're at the end, grab the the next positional, if it exists + elif (( i == ${#1} - 1 )) && [[ $2 ]]; then + OPTRET+=("$2") + shift + break + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + fi + fi + done + ;; + --?*=*|--?*) # long option + IFS='=' read -r opt optarg <<< "${1#--}" + longoptmatch "$opt" + case $? in + 0) + # parse failure + if [[ $optarg ]]; then + printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + # --longopt + else + OPTRET+=("--$opt") + fi + ;; + 1) + # --longopt=optarg + if [[ $optarg ]]; then + OPTRET+=("--$opt" "$optarg") + # --longopt optarg + elif [[ $2 ]]; then + OPTRET+=("--$opt" "$2" ) + shift + # parse failure + else + printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 + OPTRET=(--) + return 1 + fi + ;; + 254) + # ambiguous option -- error was reported for us by longoptmatch() + OPTRET=(--) + return 1 + ;; + 255) + # parse failure + printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 + OPTRET=(--) + return 1 + ;; + esac + ;; + *) # non-option arg encountered, add it as a parameter + unused_argv+=("$1") + ;; + esac + shift + done + + # add end-of-opt terminator and any leftover positional parameters + OPTRET+=('--' "${unused_argv[@]}" "$@") + unset longoptmatch + + return 0 +} diff --git a/scripts/library/README b/scripts/library/README index e9615a2..a9d15f1 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -8,26 +8,6 @@ stdout and can be silenced by defining 'QUIET'. The 'warning' and 'error' functions print to stderr with the appropriate prefix added to the message. -parseopts.sh: -A getopt_long-like parser which portably supports longopts and shortopts -with some GNU extensions. It does not allow for options with optional -arguments. For both short and long opts, options requiring an argument -should be suffixed with a colon. After the first argument containing -the short opts, any number of valid long opts may be be passed. The end -of the options delimiter must then be added, followed by the user arguments -to the calling program. - -Recommended Usage: - OPT_SHORT='fb:z' - OPT_LONG=('foo' 'bar:' 'baz') - if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then - exit 1 - fi - set -- "${OPTRET[@]}" -Returns: - 0: parse success - 1: parse failure (error message supplied) - human_to_size.sh: A function to convert human readable sizes (such as "5.3 GiB") to raw byte equivalents. base10 and base2 suffixes are supported, case sensitively. If diff --git a/scripts/library/parseopts.sh b/scripts/library/parseopts.sh deleted file mode 100644 index cf6aa6c..0000000 --- a/scripts/library/parseopts.sh +++ /dev/null @@ -1,137 +0,0 @@ -# getopt-like parser -parseopts() { - local opt= optarg= i= shortopts=$1 - local -a longopts=() unused_argv=() - - shift - while [[ $1 && $1 != '--' ]]; do - longopts+=("$1") - shift - done - shift - - longoptmatch() { - local o longmatch=() - for o in "${longopts[@]}"; do - if [[ ${o%:} = "$1" ]]; then - longmatch=("$o") - break - fi - [[ ${o%:} = "$1"* ]] && longmatch+=("$o") - done - - case ${#longmatch[*]} in - 1) - # success, override with opt and return arg req (0 == none, 1 == required) - opt=${longmatch%:} - if [[ $longmatch = *: ]]; then - return 1 - else - return 0 - fi ;; - 0) - # fail, no match found - return 255 ;; - *) - # fail, ambiguous match - printf "@SCRIPTNAME@: $(gettext "option '%s' is ambiguous; possibilities:")" "--$1" - printf " '%s'" "${longmatch[@]%:}" - printf '\n' - return 254 ;; - esac >&2 - } - - while (( $# )); do - case $1 in - --) # explicit end of options - shift - break - ;; - -[!-]*) # short option - for (( i = 1; i < ${#1}; i++ )); do - opt=${1:i:1} - - # option doesn't exist - if [[ $shortopts != *$opt* ]]; then - printf "@SCRIPTNAME@: $(gettext "invalid option") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - - OPTRET+=("-$opt") - # option requires optarg - if [[ $shortopts = *$opt:* ]]; then - # if we're not at the end of the option chunk, the rest is the optarg - if (( i < ${#1} - 1 )); then - OPTRET+=("${1:i+1}") - break - # if we're at the end, grab the the next positional, if it exists - elif (( i == ${#1} - 1 )) && [[ $2 ]]; then - OPTRET+=("$2") - shift - break - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option requires an argument") -- '%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - fi - fi - done - ;; - --?*=*|--?*) # long option - IFS='=' read -r opt optarg <<< "${1#--}" - longoptmatch "$opt" - case $? in - 0) - # parse failure - if [[ $optarg ]]; then - printf "@SCRIPTNAME@: $(gettext "option '%s' does not allow an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - # --longopt - else - OPTRET+=("--$opt") - fi - ;; - 1) - # --longopt=optarg - if [[ $optarg ]]; then - OPTRET+=("--$opt" "$optarg") - # --longopt optarg - elif [[ $2 ]]; then - OPTRET+=("--$opt" "$2" ) - shift - # parse failure - else - printf "@SCRIPTNAME@: $(gettext "option '%s' requires an argument")\n" "--$opt" >&2 - OPTRET=(--) - return 1 - fi - ;; - 254) - # ambiguous option -- error was reported for us by longoptmatch() - OPTRET=(--) - return 1 - ;; - 255) - # parse failure - printf "@SCRIPTNAME@: $(gettext "invalid option") '--%s'\n" "$opt" >&2 - OPTRET=(--) - return 1 - ;; - esac - ;; - *) # non-option arg encountered, add it as a parameter - unused_argv+=("$1") - ;; - esac - shift - done - - # add end-of-opt terminator and any leftover positional parameters - OPTRET+=('--' "${unused_argv[@]}" "$@") - unset longoptmatch - - return 0 -} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..b3cafa8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1153,8 +1153,6 @@ run_split_packaging() { pkgname=("${pkgname_backup[@]}") } -m4_include(library/parseopts.sh) - usage() { printf "makepkg (pacman) %s\n" "$makepkg_version" echo -- 2.10.0

2 2