- Pacman-contrib - lists.archlinux.org

[GIT] branch master updated (28e29dd -> 2a5fc09)
by demize＠archlinux.org 14 Feb '18

14 Feb '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 28e29dd Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf new 2a5fc09 pacscripts: Use pacman-conf rather than evaling pacman.conf fragments The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 2a5fc09 (HEAD -> master) pacscripts: Use pacman-conf rather than evaling pacman.conf fragments Detailed log of new commits: commit 2a5fc098adb9508ddd0649889a14cbcc9bd91501 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Wed Feb 14 20:40:00 2018 +0100 pacscripts: Use pacman-conf rather than evaling pacman.conf fragments Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/pacscripts.sh.in | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] pacscripts: Use pacman-conf rather than evaling pacman.conf fragments
by Johannes Löthberg 14 Feb '18

14 Feb '18

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/pacscripts.sh.in | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/pacscripts.sh.in b/src/pacscripts.sh.in index 68c9441..17e2625 100644 --- a/src/pacscripts.sh.in +++ b/src/pacscripts.sh.in @@ -27,18 +27,6 @@ set -o errexit declare -r myname='pacscripts' declare -r myver='@PACKAGE_VERSION@' -conf="@sysconfdir@/pacman.conf" - -if [ ! -r "$conf" ]; then - echo "ERROR: unable to read $conf" - exit 1 -fi - -eval $(awk '/DBPath/ {print $1$2$3}' "$conf") -eval $(awk '/CacheDir/ {print $1$2$3}' "$conf") -pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" -pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}" - error() { local mesg=$1; shift printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2 @@ -59,6 +47,15 @@ usage() { echo "Example: ${myname} gconf-editor-3.0.1-3-x86_64.pkg.tar.xz" } + +if ! DBPath="$(pacman-conf DBPath)"; then + error "unable to read @sysconfdir@/pacman.conf" + exit 1 +fi +CacheDir="$(pacman-conf CacheDir)" +pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" +pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}" + version() { printf "%s %s\n" "$myname" "$myver" echo 'Copyright (c) 2009 Giulio "giulivo" Fidente <giulivo.navigante(a)gmail.com>' -- 2.16.1

2 2

[pacman-contrib] [GIT] branch master updated (7387d68 -> 28e29dd)
by demize＠archlinux.org 14 Feb '18

14 Feb '18

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 7387d68 src/Makefile.am: Add missing backslash new 28e29dd Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 28e29dd (HEAD -> master) Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf Detailed log of new commits: commit 28e29ddfdc4c788842ba010b3660bd21575a99bd Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed Feb 14 11:54:44 2018 -0500 Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf pacman.conf cannot be properly parsed in bash, e.g. it fails to handle `Include = ` directives, hence why pacman introduced a configuration parsing tool in the first place. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Message-Id: <20180214165444.1519-1-eschwartz(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/checkupdates.sh.in | 2 +- src/paccache.sh.in | 17 +---------------- src/pacdiff.sh.in | 4 +--- 3 files changed, 3 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] Migrate scripts from manual parsing of pacman.conf, to use of pacman-conf
by Eli Schwartz 14 Feb '18

14 Feb '18

pacman.conf cannot be properly parsed in bash, e.g. it fails to handle `Include = ` directives, hence why pacman introduced a configuration parsing tool in the first place. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- src/checkupdates.sh.in | 2 +- src/paccache.sh.in | 3 +-- src/pacdiff.sh.in | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index 9f34dc1..1d01fda 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -46,7 +46,7 @@ fi trap 'rm -f $CHECKUPDATES_DB/db.lck' INT TERM EXIT -DBPath="$(awk -F' *= *' '/^DBPath/ { print $2 }' @sysconfdir@/pacman.conf)" +DBPath="$(pacman-conf DBPath)" if [[ -z "$DBPath" ]] || [[ ! -d "$DBPath" ]]; then DBPath="@localstatedir@/lib/pacman/" fi diff --git a/src/paccache.sh.in b/src/paccache.sh.in index 143c6e3..25432d4 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -287,8 +287,7 @@ m4_include(../lib/term_colors.sh) # setting default cachedirs if [[ -z $cachedirs ]]; then - cachedir="$(get_cachedirs_from_config "@sysconfdir@/pacman.conf")" - cachedirs=("${cachedirs[@]:-@localstatedir@/cache/pacman/pkg}") + cachedirs=($(pacman-conf CacheDirs)) fi # remaining args are a whitelist diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index ef385c2..866932d 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -130,12 +130,10 @@ case $(( USE_FIND + USE_LOCATE + USE_PACDB )) in esac if (( USE_PACDB )); then - if [[ ! -r @sysconfdir@/pacman.conf ]]; then + if ! DBPath="$(pacman-conf DBPath)"; then error "unable to read @sysconfdir@/pacman.conf" usage; exit 1 fi - - eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) pac_db="${DBPath:-@localstatedir@/lib/pacman/}local" if [[ ! -d "${pac_db}" ]]; then error "unable to read pacman database %s". "${pac_db}" -- 2.16.1

2 2

[pacman-contrib] [GIT] branch master updated (14c679a -> 7387d68)
by demize＠archlinux.org 19 Dec '17

19 Dec '17

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 14c679a rankmirrors: Fixe --verbose help output typo new 7387d68 src/Makefile.am: Add missing backslash The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 7387d68 (HEAD -> master) src/Makefile.am: Add missing backslash Detailed log of new commits: commit 7387d68e370464da1863827a421afbf049718de9 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue Dec 19 21:17:51 2017 +0100 src/Makefile.am: Add missing backslash Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [GIT] branch master updated (d0750b3 -> 14c679a)
by demize＠archlinux.org 29 Nov '17

29 Nov '17

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from d0750b3 paccache.service: Use actual bindir rather than hardcode /usr/bin new 14c679a rankmirrors: Fixe --verbose help output typo The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 14c679a (HEAD -> master) rankmirrors: Fixe --verbose help output typo Detailed log of new commits: commit 14c679aa037ce228bf27b79cb184a200d26cc8c9 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Wed Nov 29 16:37:34 2017 +0100 rankmirrors: Fixe --verbose help output typo Fixes FS#56504. Reported-by: Pekka Järvinen <pekka.jarvinen(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/rankmirrors.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] rankmirrors: Fixe --verbose help output typo
by Johannes Löthberg 29 Nov '17

29 Nov '17

Fixes FS#56504. Reported-by: Pekka Järvinen <pekka.jarvinen(a)gmail.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/rankmirrors.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in index a05b8e0..7f518c0 100644 --- a/src/rankmirrors.sh.in +++ b/src/rankmirrors.sh.in @@ -39,7 +39,7 @@ usage() { echo " -n NUM number of servers to output, 0 for all" echo " -t, --times only output mirrors and their response times" echo " -u, --url test a specific URL" - echo " -v, --verbose be verbose in ouptut" + echo " -v, --verbose be verbose in output" echo " -r, --repo specify a repository name instead of guessing" exit 0 } -- 2.15.0

1 0

[pacman-contrib] [GIT] branch master updated (866ab08 -> d0750b3)
by demize＠archlinux.org 22 Nov '17

22 Nov '17

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 866ab08 Add `make check` to README.md new 79de32d README.md: Fix localestatedir typo new 769a3db Add a paccache systemd service and timer files new d0750b3 paccache.service: Use actual bindir rather than hardcode /usr/bin The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * d0750b3 (HEAD -> master) paccache.service: Use actual bindir rather than hardcode /usr/bin * 769a3db Add a paccache systemd service and timer files * 79de32d README.md: Fix localestatedir typo Detailed log of new commits: commit d0750b317e4470822ff6824819fe1ab22f9154af Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Thu Nov 23 00:17:02 2017 +0100 paccache.service: Use actual bindir rather than hardcode /usr/bin Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 769a3db60a9ac06857d6a87baa2e0296f4d9257b Author: Isaac Good <isaacgood(a)gmail.com> Date: Wed Nov 22 15:06:36 2017 -0800 Add a paccache systemd service and timer files src/Makefile.am | 7 +++++++ src/paccache.service | 6 ++++++ src/paccache.timer | 10 ++++++++++ 3 files changed, 23 insertions(+) create mode 100644 src/paccache.service create mode 100644 src/paccache.timer Message-Id: <20171122230636.GA513(a)nuc.isaacgood.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 79de32d14f86b8d1a4d7602771ed6b461239f53e Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Thu Nov 23 00:00:00 2017 +0100 README.md: Fix localestatedir typo Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: README.md | 2 +- src/Makefile.am | 13 ++++++++++++- src/paccache.service.in | 6 ++++++ src/paccache.timer | 10 ++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/paccache.service.in create mode 100644 src/paccache.timer -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pacman-contrib] [PATCH] paccache.service: Use actual bindir rather than hardcode /usr/bin
by Johannes Löthberg 22 Nov '17

22 Nov '17

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- src/Makefile.am | 8 ++++++-- src/{paccache.service => paccache.service.in} | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) rename src/{paccache.service => paccache.service.in} (68%) diff --git a/src/Makefile.am b/src/Makefile.am index 4151c7d..c992f68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,9 +44,12 @@ OURSCRIPTS = \ $(BASHSCRIPTS) \ $(PERLSCRIPTS) +OURFILES = \ + paccache.service + EXTRA_DIST = \ checkupdates.sh.in \ - paccache.service \ + paccache.service.in \ paccache.sh.in \ paccache.timer \ pacdiff.sh.in \ @@ -84,6 +87,7 @@ AM_CFLAGS = \ $(LIBALPM_CFLAGS) edit = sed \ + -e 's|@bindir[@]|${bindir}|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ @@ -110,7 +114,7 @@ $(OURFILES): Makefile $(AM_V_at)chmod a-w $@.tmp $(AM_V_at)mv $@.tmp $@ -all-am: $(OURSCRIPTS) +all-am: $(OURSCRIPTS) $(OURFILES) checkupdates: $(srcdir)/checkupdates.sh.in $(top_srcdir)/lib/output_format.sh $(top_srcdir)/lib/term_colors.sh paccache: $(srcdir)/paccache.sh.in $(top_srcdir)/lib/output_format.sh $(top_srcdir)/lib/parseopts.sh $(top_srcdir)/lib/size_to_human.sh $(top_srcdir)/lib/term_colors.sh diff --git a/src/paccache.service b/src/paccache.service.in similarity index 68% rename from src/paccache.service rename to src/paccache.service.in index bd86faf..919bf74 100644 --- a/src/paccache.service +++ b/src/paccache.service.in @@ -3,4 +3,4 @@ Description=Discard unused packages [Service] Type=oneshot -ExecStart=/usr/bin/paccache -r +ExecStart=@bindir@/paccache -r -- 2.15.0

1 0

[pacman-contrib] [PATCH] Add a paccache systemd service and timer files
by Isaac Good 22 Nov '17

22 Nov '17

src/Makefile.am | 7 +++++++ src/paccache.service | 6 ++++++ src/paccache.timer | 10 ++++++++++ 3 files changed, 23 insertions(+) create mode 100644 src/paccache.service create mode 100644 src/paccache.timer diff --git a/src/Makefile.am b/src/Makefile.am index 3453b90..4151c7d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,6 +22,11 @@ vim_ftdetect__DATA = \ vim_syntax__DATA = \ vim/syntax/PKGBUILD.vim +systemd_dir = ${libdir}/systemd/system + +systemd__DATA = \ + paccache.service paccache.timer + BASHSCRIPTS = \ checkupdates \ paccache \ @@ -41,7 +46,9 @@ OURSCRIPTS = \ EXTRA_DIST = \ checkupdates.sh.in \ + paccache.service \ paccache.sh.in \ + paccache.timer \ pacdiff.sh.in \ paclist.sh.in \ paclog-pkglist.sh.in \ diff --git a/src/paccache.service b/src/paccache.service new file mode 100644 index 0000000..bd86faf --- /dev/null +++ b/src/paccache.service @@ -0,0 +1,6 @@ +[Unit] +Description=Discard unused packages + +[Service] +Type=oneshot +ExecStart=/usr/bin/paccache -r diff --git a/src/paccache.timer b/src/paccache.timer new file mode 100644 index 0000000..cd46bcb --- /dev/null +++ b/src/paccache.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Discard unused packages weekly + +[Timer] +OnCalendar=weekly +AccuracySec=1h +Persistent=true + +[Install] +WantedBy=timers.target -- 2.15.0

1 0