- Arch-projects - lists.archlinux.org

[arch-projects] [dbscripts] [PATCH] cron-jobs: remove unused cron jobs
by Jelle van der Waa 26 Aug '18

26 Aug '18

Updating the archweb database is now handled by archweb itself and deployed on the server using a systemd unit/service. These scripts are no longer used. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- README.md | 6 +-- cron-jobs/update-web-db | 78 ----------------------------------- cron-jobs/update-web-files-db | 1 - 3 files changed, 1 insertion(+), 84 deletions(-) delete mode 100755 cron-jobs/update-web-db delete mode 120000 cron-jobs/update-web-files-db diff --git a/README.md b/README.md index c672998..925cca7 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,7 @@ The executables that you (might) care about are: │ ├── devlist-mailer │ ├── ftpdir-cleanup │ ├── integrity-check - │ ├── sourceballs - │ ├── update-web-db - │ └── update-web-files-db + │ └── sourceballs ├── db-move ├── db-remove ├── db-repo-add @@ -56,8 +54,6 @@ Things that haven't been mentioned yet: - `cron-jobs/devlist-mailer` - `cron-jobs/sourceballs` - - `cron-jobs/update-web-db` - - `cron-jobs/update-web-files-db` ## Testing * Install the `make` and `docker` packages. Start the docker daemon by issuing `systemctl start docker`. * The test suite can now be run with `make test`. diff --git a/cron-jobs/update-web-db b/cron-jobs/update-web-db deleted file mode 100755 index 39ed765..0000000 --- a/cron-jobs/update-web-db +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -. "$(dirname "$(readlink -e "$0")")/../config" -. "$(dirname "$(readlink -e "$0")")/../db-functions" - -# setup paths -SPATH="/srv/http/archweb" -ENVPATH="/srv/http/archweb-env/bin/activate" - -# having "more important repos" last should make [core] trickle to the top of -# the updates list each hour rather than being overwhelmed by big [extra] and -# [community] updates -REPOS=('community-testing' 'multilib-testing' 'multilib' 'community' 'extra' 'testing' 'core') -LOGOUT="/tmp/archweb_update.log" - -# figure out what operation to perform -cmd="${0##*/}" -if [[ $cmd != "update-web-db" && $cmd != "update-web-files-db" ]]; then - die "Invalid command name '%s' specified!" "$cmd" -fi - -script_lock - -# run at nice 5. it can churn quite a bit of cpu after all. -renice +5 -p $$ > /dev/null - -echo "%s: Updating DB at %s" "$cmd" "$(date)" >> "${LOGOUT}" - -# source our virtualenv if it exists -if [[ -f "$ENVPATH" ]]; then - . "$ENVPATH" -fi - -case "$cmd" in - update-web-db) - dbfileext="${DBEXT}" - flags="" - ;; - update-web-files-db) - dbfileext="${FILESEXT}" - flags="--filesonly" - ;; -esac - -# Lock the repos and get a copy of the db files to work on -for repo in "${REPOS[@]}"; do - for arch in "${ARCHES[@]}"; do - repo_lock "${repo}" "${arch}" || exit 1 - dbfile="/srv/ftp/${repo}/os/${arch}/${repo}${dbfileext}" - if [[ -f ${dbfile} ]]; then - mkdir -p "${WORKDIR}/${repo}/${arch}" - cp "${dbfile}" "${WORKDIR}/${repo}/${arch}/${repo}${dbfileext}" - fi - repo_unlock "${repo}" "${arch}" - done -done - -# Run reporead on our db copy -pushd "$SPATH" >/dev/null -for repo in "${REPOS[@]}"; do - for arch in "${ARCHES[@]}"; do - dbcopy="${WORKDIR}/${repo}/${arch}/${repo}${dbfileext}" - if [[ -f ${dbcopy} ]]; then - echo "Updating ${repo}-${arch}" >> "${LOGOUT}" - ./manage.py reporead "${flags}" "${arch}" "${dbcopy}" >> "${LOGOUT}" 2>&1 - echo "" >> "${LOGOUT}" - fi - done -done -popd >/dev/null -echo "" >> "${LOGOUT}" - -# rotate the file if it is getting big (> 10M), overwriting any old backup -if [[ $(stat -c%s "${LOGOUT}") -gt 10485760 ]]; then - mv "${LOGOUT}" "${LOGOUT}.old" -fi - -script_unlock diff --git a/cron-jobs/update-web-files-db b/cron-jobs/update-web-files-db deleted file mode 120000 index 0c2c4fa..0000000 --- a/cron-jobs/update-web-files-db +++ /dev/null @@ -1 +0,0 @@ -update-web-db \ No newline at end of file -- 2.18.0

2 1

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.18 created. 1.18
by Jouke Witteveen 07 Aug '18

07 Aug '18

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 "Network control utility based on systemd". The annotated tag, 1.18 has been created at 752de745e674cdb66b07a4d36a85188e689d8855 (tag) tagging 9044d45d9d25c585f666e51f47da5559b165c837 (commit) replaces 1.17 tagged by Jouke Witteveen on Tue Aug 7 17:47:51 2018 +0200 - Log ----------------------------------------------------------------- Release 1.18 -----BEGIN PGP SIGNATURE----- iQFKBAABCAA0FiEEbql9KtO+F66lkufaVrYfv4JJLBUFAltpvy0WHGoud2l0dGV2 ZWVuQGdtYWlsLmNvbQAKCRBWth+/gkksFb3bB/4+Xex1tOwXJXinZdX7CB0BZgZ7 R1yQY7GCxh75xmi32bYYjJBF7eRlhxImt55EzUi08dN5Ii58+zbWMQciSgs5QwCa DuJnke6LvHoEDUeZI4wcms6cNXwXGdYOkDX5oxtd7zjQAQoMdjy3BGfxVVYrCcrQ pcxVZsZnmBSxtRIIL1JvYVJxbg2KVUQm3qAXji5idR261JRMlHjxr+x1kX2Xc/mx 5S9XVotctKYjNtFRDsFGIsW+AyI0PO0yz1jiqaKrWN1leGjYxIcsLiJpyuliu+VR oMnfeFQm3nR250mhZehGmUWG4QwwrMkxpn6TDGrforaDOkEjc0o66esQlEvC =TCy6 -----END PGP SIGNATURE----- Jouke Witteveen (6): Use drop-in directories instead of .include statements Centralize profile exposing through the Profile variable Switch to single quotes in contexts where we may want to use '\' PKGBUILD: depend on resolvconf instead of on openresolv PKGBUILD: add post_upgrade messages 1.18 release updates ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.17-6-g9044d45
by Jouke Witteveen 07 Aug '18

07 Aug '18

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 "Network control utility based on systemd". The branch, master has been updated via 9044d45d9d25c585f666e51f47da5559b165c837 (commit) via 9e9014e57e72ef321ef959bfbf645b9062cd5d15 (commit) from e9c5de21c2d50c8fd8d1343feecb632bf836eec1 (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 9044d45d9d25c585f666e51f47da5559b165c837 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Aug 7 17:47:24 2018 +0200 1.18 release updates commit 9e9014e57e72ef321ef959bfbf645b9062cd5d15 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Aug 4 18:16:30 2018 +0200 PKGBUILD: add post_upgrade messages ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + Makefile | 9 ++++++--- NEWS | 4 ++++ contrib/PKGBUILD.in | 1 + contrib/netctl.install | 10 ++++++++++ docs/Makefile | 3 ++- 6 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 contrib/netctl.install hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl][PATCH] PKGBUILD: add post_upgrade messages
by Jouke Witteveen 04 Aug '18

04 Aug '18

--- I am still a little hesitant to carry this in the netctl repository. Currently, the repository is more or less distribution agnostic. Makefile | 7 +++++-- contrib/PKGBUILD.in | 1 + contrib/netctl.install | 10 ++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 contrib/netctl.install diff --git a/Makefile b/Makefile index 7e6a7c9..003abfc 100644 --- a/Makefile +++ b/Makefile @@ -49,16 +49,19 @@ netctl-$(VERSION).tar.xz: gpg --detach-sign $@ pkgbuild: PKGBUILD -PKGBUILD: netctl-$(VERSION).tar.xz contrib/PKGBUILD.in +PKGBUILD: netctl-$(VERSION).tar.xz contrib/PKGBUILD.in netctl.install sed -e "s|@pkgver@|$(VERSION)|g" \ -e "s|@md5sum@|$(shell md5sum $< | cut -d ' ' -f 1)|" \ -e "s|@md5sum.sig@|$(shell md5sum $<.sig | cut -d ' ' -f 1)|" \ $(lastword $^) > $@ +netctl.install: contrib/netctl.install + cp $< $@ + upload: netctl-$(VERSION).tar.xz scp $< $<.sig sources.archlinux.org:/srv/ftp/other/packages/netctl clean: $(MAKE) -C docs clean - -@rm -vf PKGBUILD *.tar.xz *.tar.xz.sig 2>/dev/null + -@rm -vf netctl-*.tar.xz{,.sig} PKGBUILD netctl.install diff --git a/contrib/PKGBUILD.in b/contrib/PKGBUILD.in index 71b1f5c..b5ce44c 100644 --- a/contrib/PKGBUILD.in +++ b/contrib/PKGBUILD.in @@ -19,6 +19,7 @@ optdepends=('dialog: for the menu based wifi assistant' 'ppp: for PPP connections' 'openvswitch: for Open vSwitch connections' ) +install=netctl.install source=(https://sources.archlinux.org/other/packages/netctl/netctl-${pkgver… arch=('any') md5sums=('@md5sum@' diff --git a/contrib/netctl.install b/contrib/netctl.install new file mode 100644 index 0000000..920ce5e --- /dev/null +++ b/contrib/netctl.install @@ -0,0 +1,10 @@ +post_upgrade() { + if [[ $(vercmp 1.18 "$2") -gt 0 ]]; then + grep -ls '^.include ' /etc/systemd/system/netctl(a)*.service | \ + while read -r unit; do + profile=$(systemd-escape --unescape "${unit:27:-8}") + echo ":: The unit for profile '$profile' uses deprecated features." + echo " Consider running: netctl reenable $(printf '%q' "$profile")" + done + fi +} -- 2.18.0

1 0

[arch-projects] [netctl] news draft
by Jouke Witteveen 03 Aug '18

03 Aug '18

Hello all, I cannot send to arch-dev-public and don't know where to post this otherwise, so I'll just put this out here. With systemd 239, a deprecation message is printed in the journal for enabled netctl profiles (FS#59494). This currently has no effect on the functionality of either systemd or netctl. Nevertheless, the next version of netctl, which is not yet released, will move away from the deprecated features. However, the warnings are caused by unit files generated by netctl, so an update will not simply make the warnings go away. Here is a draft for a news post to accompany the next version of netctl down the line. Regards, - Jouke ---- Title: netctl 1.18 may require manual intervention In response to the explicit deprecation of .include statements in systemd units, netctl has modified its unit management. This change only affects individually enabled netctl profiles. To use the new management scheme, all enabled profiles must be reenabled after updating netctl. This can be done through `netctl reenable <profile>`. No action is needed for the automatic netctl services.

2 3

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.17-4-ge9c5de2
by Jouke Witteveen 03 Aug '18

03 Aug '18

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 "Network control utility based on systemd". The branch, master has been updated via e9c5de21c2d50c8fd8d1343feecb632bf836eec1 (commit) via a49ffaf79fee536ded2465f2cb669b024f43274a (commit) via 1a35b9ffe7464e4fdffff02898a2a97e38c4236e (commit) via 04d39b2573bd34d4159837afdb4793a0990bd44a (commit) from 4be6904e2518b5b13675439d6b89592e6bb4a6e3 (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 e9c5de21c2d50c8fd8d1343feecb632bf836eec1 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Aug 2 14:29:21 2018 +0200 PKGBUILD: depend on resolvconf instead of on openresolv Depend on the interface, not on the implementation. Nevertheless, for netctl, openresolv is the preferred implementation. commit a49ffaf79fee536ded2465f2cb669b024f43274a Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Jul 28 23:09:29 2018 +0200 Switch to single quotes in contexts where we may want to use '\' Inside double quotes, backslash is an escape character. Hence, it is cleaner to use single quotes where backslashes may occur. This includes pattern strings for print, grep, and sed. commit 1a35b9ffe7464e4fdffff02898a2a97e38c4236e Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Jul 28 14:31:43 2018 +0200 Centralize profile exposing through the Profile variable This also allows hooks to alter the profile to be loaded. commit 04d39b2573bd34d4159837afdb4793a0990bd44a Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Jul 28 14:07:50 2018 +0200 Use drop-in directories instead of .include statements The .include directive in systemd unit files has effectively been deprecated since systemd v210. Its functionality is subsumed by drop-in directories. ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.in | 2 +- contrib/bash-completion | 2 +- contrib/zsh-completion | 2 +- src/ifplugd.action | 4 ++-- src/lib/auto.action | 4 +--- src/lib/connections/wireless | 2 +- src/lib/globals | 14 +++++++----- src/lib/ip | 2 +- src/lib/network | 5 ++-- src/lib/wpa | 14 ++++++------ src/netctl-auto | 4 ++-- src/netctl.in | 54 ++++++++++++++++++++++---------------------- src/wifi-menu | 16 ++++++------- 13 files changed, 62 insertions(+), 63 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl][PATCH] Use drop-in directories instead of .include statements
by Jouke Witteveen 28 Jul '18

28 Jul '18

The .include directive in systemd unit files has effectively been deprecated since systemd v210. Its functionality is subsumed by drop-in directories. --- src/netctl.in | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/netctl.in b/src/netctl.in index b5da594..6aeed7e 100644 --- a/src/netctl.in +++ b/src/netctl.in @@ -90,43 +90,43 @@ switch_to() { } unit_enable() { - local unit="@systemdsystemconfdir@/netctl@$(systemd-escape "$1").service" - if [[ -e $unit ]]; then - report_error "A unit file for profile '$1' already exists" + local unit=$(systemd-escape --template=netctl@.service "$1") target + load_profile "$1" + + target="@systemdsystemconfdir@/multi-user.target.wants/$unit" + if [[ -e $target ]]; then + report_error "The profile '$1' is already enabled" return 1 fi - load_profile "$1" - do_readable touch "$unit" - echo ".include @systemdsystemunitdir@/netctl@.service" > "$unit" - echo -e "\n[Unit]" >> "$unit" - [[ $Description ]] && echo "Description=$Description" >> "$unit" + do_readable mkdir -p "$(dirname "$target")" + ln -vs "@systemdsystemunitdir@/netctl@.service" "$target" + + target="@systemdsystemconfdir@/$unit.d/profile.conf" + do_readable mkdir -p "$(dirname "$target")" + do_readable touch "$target" + echo "[Unit]" > "$target" + if [[ $Description ]]; then + echo "Description=$Description" >> "$target" + fi declare -p BindsToInterfaces &> /dev/null || BindsToInterfaces=$Interface if (( ${#BindsToInterfaces[@]} )); then : ${InterfaceRoot=sys/subsystem/net/devices/} printf "BindsTo=$(systemd-escape "$InterfaceRoot")%s.device\n" \ - $(systemd-escape "${BindsToInterfaces[@]}") >> "$unit" + $(systemd-escape "${BindsToInterfaces[@]}") >> "$target" printf "After=$(systemd-escape "$InterfaceRoot")%s.device\n" \ - $(systemd-escape "${BindsToInterfaces[@]}") >> "$unit" + $(systemd-escape "${BindsToInterfaces[@]}") >> "$target" fi if (( ${#After[@]} )); then printf 'After=netctl(a)%s.service\n' \ - $(systemd-escape "${After[@]}") >> "$unit" + $(systemd-escape "${After[@]}") >> "$target" fi - mkdir -p "@systemdsystemconfdir@/multi-user.target.wants" - echo "ln -s '$unit' '${unit/system\//system/multi-user.target.wants/}'" - ln -s "$unit" "${unit/system\//system/multi-user.target.wants/}" + report_notice "generated '$target'" } unit_disable() { - local unit="@systemdsystemconfdir@/netctl@$(systemd-escape "$1").service" - if sd_call "is-enabled --quiet" "$1" &> /dev/null; then - sd_call disable "$1" - fi - if [[ ! -f $unit ]]; then - report_error "No regular unit file found for profile '$1'" - return 1 - fi - do_debug rm "$unit" + local unit=$(systemd-escape --template=netctl@.service "$1") + rm -vfd "@systemdsystemconfdir@"{/multi-user.target.wants,}"/$unit" \ + "@systemdsystemconfdir@/$unit.d"{/profile.conf,} } wait_online() { -- 2.18.0

1 0

[arch-projects] [devtools] [PATCH] Expand check_root keepenv variables
by Morten Linderud 24 Jul '18

24 Jul '18

From: Morten Linderud <morten(a)linderud.pw> makechrootpkg checks the environment for multiple variables before overwriting them with makepkg.conf configurations. Expand check_root with the variables makechrootpkg check for so we are capable of overwriting them when needed. Signed-off-by: Morten Linderud <foxboron(a)archlinux.org> --- archbuild.in | 2 +- lib/archroot.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archbuild.in b/archbuild.in index 1e5b582..6f22b12 100644 --- a/archbuild.in +++ b/archbuild.in @@ -39,7 +39,7 @@ while getopts 'hcr:' arg; do esac done -check_root SOURCE_DATE_EPOCH +check_root SOURCE_DATE_EPOCH SRCDEST SRCPKGDEST PKGDEST LOGDEST MAKEFLAGS PACKAGER # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") diff --git a/lib/archroot.sh b/lib/archroot.sh index f279603..82276e2 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -10,7 +10,7 @@ CHROOT_VERSION='v4' ## orig_argv=("$0" "$@") check_root() { - local keepenv=$1 + local keepenv=$(tr " " "," <<< $@) (( EUID == 0 )) && return if type -P sudo >/dev/null; then -- 2.18.0

2 1

[arch-projects] [devtools] [PATCH 1/1] arch-nspawn: ignore localhost for repository mirror
by Christian Hesse 23 Jul '18

23 Jul '18

From: Christian Hesse <mail(a)eworm.de> My system has a mirror configuration where only the host can access a local caching service on localhost. So ignore localhost urls. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- arch-nspawn.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index b9c846e..020ed71 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,7 +60,7 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') +host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | grep -E -v '(127.0.0.1|localhost)' | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') # shellcheck disable=2016 [[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')

2 5

Re: [arch-projects] [devtools] [PATCH] makechrootpkg: Skip PGP checks inside the chroot
by Alexander Shpilkin 13 Jul '18

13 Jul '18

On Fri, 2018-07-13 at 06:55 +0200, Alexander Shpilkin wrote: > As with the integrity checks, these have already been done in > download_sources(), and the GPG keyring is unavailable inside the > chroot anyway. Err... Nevermind, apparently --skipinteg disables PGP as well, and I messed up my debugging today. Sorry for the noise. --Alex

1 0