From 1918eeec794d764ce021996ab66e923fc50195b4 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Sun, 24 May 2015 08:02:12 +0100
Subject: db-update: Remove debugging code
---
db-update | 5 -----
1 file changed, 5 deletions(-)
diff --git a/db-update b/db-update
index 3c06f63..0c4f824 100755
--- a/db-update
+++ b/db-update
@@ -3,11 +3,6 @@
. "$(dirname "$(readlink -e "$0")")/config"
. "$(dirname "$(readlink -e "$0")")/db-functions"
-if [[ $STAGING = *luke* ]]; then
- set -x
- PKGEXT='.pkg.tar.?z'
-fi
-
if [ $# -ge 1 ]; then
warning "Calling %s with a specific repository is no longer supported" "${0##*/}"
exit 1
--
cgit v1.2.3-2-g168b
From cbefaa1b5750a1a24ac343633e9ad3ba794f2938 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Sun, 24 May 2015 08:03:06 +0100
Subject: db-sync.conf: mess with mirrors
---
db-sync.conf | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/db-sync.conf b/db-sync.conf
index 3d6c709..f7748c3 100644
--- a/db-sync.conf
+++ b/db-sync.conf
@@ -1,7 +1,11 @@
-#mirror="mirrors.uk2.net"
-mirror="mirrors.kernel.org"
-#mirror="mirror.umd.edu"
-#mirror="archlinux.c3sl.ufpr.br"
+#mirror="mirrors.kernel.org"
+mirror="mirrors.niyawe.de"
+
+## mirrors without sources folder
+#mirror="mirror.nl.leaseweb.net"
+#mirror="mirror.one.com"
#mirror="mirror.us.leaseweb.net"
+#mirror="mirror.bytemark.co.uk"
#mirror="mirror.de.leaseweb.net"
+
mirrorpath="archlinux"
--
cgit v1.2.3-2-g168b
From 8a57cf2f7a1f83083dec391a2c157f552c0725a7 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Sun, 24 May 2015 08:06:42 +0100
Subject: abslibre: pass '--quiet' to rsync
---
abslibre | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abslibre b/abslibre
index 0b3e371..78ec81e 100755
--- a/abslibre
+++ b/abslibre
@@ -5,7 +5,7 @@ ABSGIT=/srv/git/repositories/abslibre.git
# Remote
# ABSGIT=http://projects.parabolagnulinux.org/abslibre.git
BLACKLIST='https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt'
-SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g'
+SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g --quiet'
BLFILE=/tmp/blacklist.txt
# Variables from abs.conf
@@ -60,7 +60,7 @@ function sync_abs_libre() {
${ABSROOT} \
${ABSLIBRE} \
&&
- for ARCH in i686 x86_64; do rsync -v -mrtq --no-motd --no-p --no-o --no-g --exclude=.git/ /var/tmp/abslibre/ ${ABSLIBRE}/${ARCH}/; done) || {
+ for ARCH in i686 x86_64; do rsync -v -mrtq --no-motd --no-p --no-o --no-g --quiet --exclude=.git/ /var/tmp/abslibre/ ${ABSLIBRE}/${ARCH}/; done) || {
printf "[FAILED]\n"
return 1
}
--
cgit v1.2.3-2-g168b
From 0527d9f1f600387f3397ebcbaff1a6742862cf9f Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Sun, 24 May 2015 08:09:56 +0100
Subject: abslibre: use `set -e` for cleaner error handling
---
abslibre | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/abslibre b/abslibre
index 78ec81e..493a266 100755
--- a/abslibre
+++ b/abslibre
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e -x
+
ABSLIBRE=/srv/abslibre
ABSGIT=/srv/git/repositories/abslibre.git
# Remote
@@ -111,14 +113,9 @@ create_tarballs() {
done
}
-sync_abs || exit 1
-get_blacklist || exit 1
-sync_abs_libre || exit 1
+sync_abs
+get_blacklist
+sync_abs_libre
# This is being done at repo server now
-sync_pre_mips64el || exit 1
-#create_tarballs || exit 1
-
-echo "Exclusion list used"
-cat ${BLFILE}
-
-exit 0
+sync_pre_mips64el
+#create_tarballs
--
cgit v1.2.3-2-g168b
From 60c97dd73fa93fffaef35ce169330daf0dbc8ce4 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Sun, 24 May 2015 08:18:17 +0100
Subject: abslibre: remember these things called variables, so we don't need to
chage the same thing in a dozen places?
---
abslibre | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/abslibre b/abslibre
index 493a266..a4af041 100755
--- a/abslibre
+++ b/abslibre
@@ -2,6 +2,7 @@
set -e -x
+FTP_BASE=/srv/repo/main
ABSLIBRE=/srv/abslibre
ABSGIT=/srv/git/repositories/abslibre.git
# Remote
@@ -52,7 +53,7 @@ function sync_abs_libre() {
git pull
popd >/dev/null 2>&1
else
- git clone /srv/git/abslibre.git /var/tmp/abslibre
+ git clone "$ABSGIT" /var/tmp/abslibre
fi
# Sync from ABS and then sync from ABSLibre
@@ -102,11 +103,11 @@ create_tarballs() {
arch=$(basename $(dirname $repo))
# Remove the old one
- mkdir -p /srv/http/web/media/abs/$baserepo/os/$arch/
- rm /srv/http/web/media/abs/$baserepo/os/$arch/$baserepo.abs.tar.gz
+ mkdir -p $FTP_BASE/$baserepo/os/$arch/
+ rm $FTP_BASE/$baserepo/os/$arch/$baserepo.abs.tar.gz
# Create a new one joining arch and any
# Remove the first part of the path (it could be $repo but any isn't hit)
- bsdtar -czvf /srv/http/web/media/abs/$baserepo/os/$arch/$baserepo.abs.tar.gz \
+ bsdtar -czvf $FTP_BASE/$baserepo/os/$arch/$baserepo.abs.tar.gz \
-s ":${ABSLIBRE}/[a-z0-9_]\+/[a-z]\+::" \
$repo/* ${ABSLIBRE}/any/${baserepo}/*
--
cgit v1.2.3-2-g168b
From 4595d68c985d05340f2e316823a34b759b043e69 Mon Sep 17 00:00:00 2001
From: Parabola <dev@list.parabolagnulinux.org>
Date: Sun, 24 May 2015 08:19:40 +0100
Subject: abslibre: misc changes, look at the diff
---
abslibre | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/abslibre b/abslibre
index a4af041..af57ec2 100755
--- a/abslibre
+++ b/abslibre
@@ -4,10 +4,10 @@ set -e -x
FTP_BASE=/srv/repo/main
ABSLIBRE=/srv/abslibre
-ABSGIT=/srv/git/repositories/abslibre.git
+ABSGIT=/srv/git/abslibre/abslibre.git
# Remote
# ABSGIT=http://projects.parabolagnulinux.org/abslibre.git
-BLACKLIST='https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt'
+BLACKLIST=/home/repo/blacklist/blacklist.txt
SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g --quiet'
BLFILE=/tmp/blacklist.txt
@@ -29,11 +29,15 @@ function sync_abs() {
for ARCH in any i686 x86_64; do
rsync ${SYNCARGS} ${SYNCSERVER}::abs/${ARCH}/ ${ABSROOT}/${ARCH} || return $?
done
+
+ # fix some permissions
+ find "${ABSROOT}" -type d -print0 | xargs -0 chmod 755
+ find "${ABSROOT}" -type f -print0 | xargs -0 chmod 644
}
function get_blacklist() {
printf ":: Updating blacklist...\t"
- wget -q -O - "${BLACKLIST}" | cut -d':' -f1 | sort -u | \
+ cat "${BLACKLIST}" | cut -d':' -f1 | sort -u | \
sed "s/^/**\//" > ${BLFILE} || {
printf "[FAILED]\n"
return 1
@@ -68,6 +72,10 @@ function sync_abs_libre() {
return 1
}
+ # fix some permissions
+ find "${ABSLIBRE}" -type d -print0 | xargs -0 chmod 755
+ find "${ABSLIBRE}" -type f -print0 | xargs -0 chmod 644
+
printf "[OK]\n"
}
@@ -104,10 +112,10 @@ create_tarballs() {
# Remove the old one
mkdir -p $FTP_BASE/$baserepo/os/$arch/
- rm $FTP_BASE/$baserepo/os/$arch/$baserepo.abs.tar.gz
+ rm -fv $FTP_BASE/$baserepo/os/$arch/$baserepo.abs.tar.gz
# Create a new one joining arch and any
# Remove the first part of the path (it could be $repo but any isn't hit)
- bsdtar -czvf $FTP_BASE/$baserepo/os/$arch/$baserepo.abs.tar.gz \
+ bsdtar -czf $FTP_BASE/$baserepo/os/$arch/$baserepo.abs.tar.gz \
-s ":${ABSLIBRE}/[a-z0-9_]\+/[a-z]\+::" \
$repo/* ${ABSLIBRE}/any/${baserepo}/*
@@ -117,6 +125,5 @@ create_tarballs() {
sync_abs
get_blacklist
sync_abs_libre
-# This is being done at repo server now
-sync_pre_mips64el
-#create_tarballs
+#sync_pre_mips64el
+create_tarballs
--
cgit v1.2.3-2-g168b
From bce56345e8df88782139179cc260bbffeb47290d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 20 May 2015 20:35:07 -0600
Subject: testing2x: Remove; it has no place in Parabola.
It was for moving packages from testing to [core] or [extra]
(automatically picking the right one). We, of course, don't do that.
---
testing2x | 61 -------------------------------------------------------------
1 file changed, 61 deletions(-)
delete mode 100755 testing2x
diff --git a/testing2x b/testing2x
deleted file mode 100755
index 2ed5c25..0000000
--- a/testing2x
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-. "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-functions"
-
-if [ $# -lt 1 ]; then
- msg "usage: %s <pkgname|pkgbase> ..." "${0##*/}"
- exit 1
-fi
-
-# Lock everything to reduce possibility of interfering task between the different repo-updates
-script_lock
-for repo in 'core' 'extra' 'testing'; do
- for pkgarch in "${ARCHES[@]}"; do
- repo_lock "${repo}" "${pkgarch}" || exit 1
- done
-done
-
-declare -A pkgs
-
-for pkgbase in "$@"; do
- if [ ! -d "${WORKDIR}/${pkgbase}" ]; then
- /usr/bin/svn export -q "${SVNREPO}/${pkgbase}/repos" "${WORKDIR}/${pkgbase}" >/dev/null
-
- found_source=false
- for pkgarch in "${ARCHES[@]}" 'any'; do
- svnrepo_from="${WORKDIR}/${pkgbase}/testing-${pkgarch}"
- if [ -r "${svnrepo_from}/PKGBUILD" ]; then
- found_source=true
- break
- fi
- done
- "${found_source}" || die "%s not found in [testing]" "${pkgbase}"
- found_target=false
- for pkgarch in "${ARCHES[@]}" 'any'; do
- for repo in 'core' 'extra'; do
- svnrepo_to="${WORKDIR}/${pkgbase}/${repo}-${pkgarch}"
- if [ -r "${svnrepo_to}/PKGBUILD" ]; then
- found_target=true
- pkgs[${repo}]+="${pkgbase} "
- break 2
- fi
- done
- done
- "${found_target}" || die "%s neither found in [core] nor [extra]" "${pkgbase}"
- fi
-done
-
-for pkgarch in "${ARCHES[@]}"; do
- repo_unlock 'testing' "${pkgarch}"
-done
-for repo in 'core' 'extra'; do
- for pkgarch in "${ARCHES[@]}"; do
- repo_unlock "${repo}" "${pkgarch}"
- done
- if [ -n "${pkgs[${repo}]}" ]; then
- "$(dirname "$(readlink -e "$0")")/db-move" 'testing' "${repo}" ${pkgs[${repo}]}
- fi
-done
-
-script_unlock
--
cgit v1.2.3-2-g168b
From 2b25f7944ef903ede14d573b2ea5e7c9d736017e Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 16:28:46 -0600
Subject: cron-jobs/update-abs-tarballs: Remove; everything is on the same
server now.
It just ran `rsync` to sync things between servers.
---
cron-jobs/update-abs-tarballs | 5 -----
1 file changed, 5 deletions(-)
delete mode 100755 cron-jobs/update-abs-tarballs
diff --git a/cron-jobs/update-abs-tarballs b/cron-jobs/update-abs-tarballs
deleted file mode 100755
index e710f7c..0000000
--- a/cron-jobs/update-abs-tarballs
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. "$(dirname "$(readlink -e "$0")")/../config"
-
-rsync -av --exclude=staging/ parabolagnulinux.org::abstar/ "${FTP_BASE}/"
--
cgit v1.2.3-2-g168b
From 70a3f4fb4d6994e73b5ad19b4218bde609150249 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 16:29:07 -0600
Subject: repo-sanity-check: expand on the comment at the top.
---
cron-jobs/repo-sanity-check | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index bd89240..239f042 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,5 +1,8 @@
#!/bin/bash
-# Solves issue165... on the old flyspray install. I have no idea what issue that was.
+# Solves issue165... on the old roundup install. From the database
+# backups, the title was "Older/deprecated packages never leave the
+# repo", I don't know how the body of the issue is stored in the DB,
+# but the title says enough, I think.
. "$(dirname "$(readlink -e "$0")")/../config"
. "$(dirname "$(readlink -e "$0")")/../db-functions"
--
cgit v1.2.3-2-g168b
From 7efc4b2b48f9ed1669a17b3cd307db0f17e193e9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 12:32:44 -0600
Subject: db-remove: remove_pkgs= should have been remove_pkgs+=
Because of this mistake, it didn't properly handle specifying multiple
pkgbases.
---
db-remove | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/db-remove b/db-remove
index 8fff9db..2f18ff7 100755
--- a/db-remove
+++ b/db-remove
@@ -31,7 +31,7 @@ for pkgbase in "${pkgbases[@]}"; do
msg "Removing %s from [%s]..." "$pkgbase" "$repo"
if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
- remove_pkgs=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
+ remove_pkgs+=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
else
warning "%s not found in ABS(libre)" "$pkgbase"
warning "Removing only %s from the repo" "$pkgbase"
--
cgit v1.2.3-2-g168b
From 0be51cb3e78592984ea8152cac176448d1765fb0 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 24 May 2015 12:35:53 -0600
Subject: db-remove: pull the path ${SVNREPO}/$repo/$pkgbase into a variable.
This way, if it changes, it only needs to be changed in one place.
---
db-remove | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/db-remove b/db-remove
index 2f18ff7..53fdb2a 100755
--- a/db-remove
+++ b/db-remove
@@ -30,8 +30,9 @@ remove_pkgs=()
for pkgbase in "${pkgbases[@]}"; do
msg "Removing %s from [%s]..." "$pkgbase" "$repo"
- if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
- remove_pkgs+=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo "${pkgname[@]}"))
+ path="${SVNREPO}/$repo/$pkgbase"
+ if [ -d "$path" ]; then
+ remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}"))
else
warning "%s not found in ABS(libre)" "$pkgbase"
warning "Removing only %s from the repo" "$pkgbase"
--
cgit v1.2.3-2-g168b
From d0834f7e6bd53ea729374eab138bb38a36c73996 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 20 May 2015 20:41:17 -0600
Subject: Clean up shebangs
---
config | 2 +-
cron-jobs/check_archlinux/check_packages.py | 2 +-
cron-jobs/make_repo_torrents | 2 +-
db-functions | 2 +-
list_nonfree_in_db.py | 2 +-
make_individual_torrent | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config b/config
index fdf3ef9..ec732c8 100644
--- a/config
+++ b/config
@@ -1,4 +1,4 @@
-#!/bin/bash # as a hint to text editors
+#!/hint/bash
FTP_BASE="/srv/repo/main"
SVNREPO="/var/abs"
diff --git a/cron-jobs/check_archlinux/check_packages.py b/cron-jobs/check_archlinux/check_packages.py
index d233bf6..ac0194f 100755
--- a/cron-jobs/check_archlinux/check_packages.py
+++ b/cron-jobs/check_archlinux/check_packages.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/env python2
#
# check_archlinux.py
#
diff --git a/cron-jobs/make_repo_torrents b/cron-jobs/make_repo_torrents
index fc723f1..2eb0978 100755
--- a/cron-jobs/make_repo_torrents
+++ b/cron-jobs/make_repo_torrents
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
# Copyright (C) 2014 Joseph Graham <joseph@t67.eu>
#
# This program is free software: you can redistribute it and/or modify
diff --git a/db-functions b/db-functions
index dd8e2dc..a0b20cd 100644
--- a/db-functions
+++ b/db-functions
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/hint/bash
# Some PKGBUILDs need CARCH to be set
CARCH="x86_64"
diff --git a/list_nonfree_in_db.py b/list_nonfree_in_db.py
index 4e1b164..a486fa5 100755
--- a/list_nonfree_in_db.py
+++ b/list_nonfree_in_db.py
@@ -1,4 +1,4 @@
-#! /usr/bin/python2
+#!/usr/bin/env python2
#-*- encoding: utf-8 -*-
from filter import *
import argparse
diff --git a/make_individual_torrent b/make_individual_torrent
index e5b7d8c..0a7e778 100755
--- a/make_individual_torrent
+++ b/make_individual_torrent
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
# Copyright (C) 2014 Joseph Graham <joseph@t67.eu>
#
# This program is free software: you can redistribute it and/or modify
--
cgit v1.2.3-2-g168b