Switch to use libreblacklist.parabola/20170117

7 files changed, 10 insertions, 23 deletions

diff --git a/db-check-nonfree b/db-check-nonfree
index ea123fa..dd69501 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 . "$(dirname "$(readlink -e "$0")")/config"
-. "$(dirname "$(readlink -e "$0")")/db-check-nonfree.conf"
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -ge 1 ]; then
@@ -17,7 +16,8 @@ for repo in "${repos[@]}"; do
 done
 
 msg "Check nonfree in repo:"
-nonfree=($(cut -d: -f1 "${BLACKLIST_FILE}" | sort -u))
+libreblacklist update
+nonfree=($(libreblacklist get-pkg | sort -u))
 for repo in "${ARCHREPOS[@]}"; do
 	for pkgarch in "${ARCHES[@]}"; do
 		msg2 "%s %s" "$repo" "$pkgarch"
diff --git a/db-check-nonfree.conf b/db-check-nonfree.conf
deleted file mode 100644
index ea3330c..0000000
--- a/db-check-nonfree.conf
+++ /dev/null
@@ -1 +0,0 @@
-BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
diff --git a/db-import-archlinux-pkg b/db-import-archlinux-pkg
index 17fa38d..b9389ba 100755
--- a/db-import-archlinux-pkg
+++ b/db-import-archlinux-pkg
@@ -44,11 +44,6 @@ get_repo_content() {
 		sort -u
 }
 
-# Prints blacklisted packages
-get_blacklist() {
-	cut -d ':' -f 1 "${BLACKLIST_FILE}"
-}
-
 # repo
 # arch
 get_repo_file() {
@@ -59,7 +54,8 @@ get_repo_file() {
 init() {
 
 	# Get the blacklisted packages
-	blacklist=($(get_blacklist))
+	libreblacklist update
+	blacklist=($(libreblacklist get-pkg))
 	# Store all the whitelist files
 	whitelists=()
 
@@ -197,7 +193,7 @@ source "$(dirname "$(readlink -e "$0")")/db-import-archlinux.conf"
 source "$(librelib messages)"
 
 # Check variables presence
-for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do
+for var in DBEXT FILESEXT mirror mirrorpath WORKDIR FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do
 	test -z "${!var}" && fatal_error "Empty %s" "${var}"
 done
 
diff --git a/db-import-archlinux-src b/db-import-archlinux-src
index 72171f1..8dbb744 100755
--- a/db-import-archlinux-src
+++ b/db-import-archlinux-src
@@ -7,7 +7,6 @@ ABSLIBRE=/srv/abslibre
 ABSGIT=/srv/git/abslibre/abslibre.git
 # Remote
 # ABSGIT=http://projects.parabolagnulinux.org/abslibre.git
-BLACKLIST=/home/repo/blacklist/blacklist.txt
 SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g --quiet'
 BLFILE=/tmp/blacklist.txt
 
@@ -36,8 +35,8 @@ function sync_abs() {
 }
 
 function get_blacklist() {
-	printf ":: Updating blacklist...\t"
-	cat "${BLACKLIST}" | cut -d':' -f1 | sort -u | \
+	libreblacklist update
+	libreblacklist get-pkg | sort -u | \
 		sed "s/^/**\//" > ${BLFILE} || {
 		printf "[FAILED]\n"
 		return 1
diff --git a/db-import-archlinux.conf b/db-import-archlinux.conf
index fdf7a6a..b2930b4 100644
--- a/db-import-archlinux.conf
+++ b/db-import-archlinux.conf
@@ -4,8 +4,6 @@ ARCHSRCPOOLS=(sources/{packages,community})
 ARCHARCHES=(i686 x86_64)
 OURARCHES=(armv7h)
 
-BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
-
 mirror="archlinux.mirror.pkern.at"
 #mirror="mirrors.kernel.org"
 
diff --git a/db-import-archlinuxarm-pkg b/db-import-archlinuxarm-pkg
index ef8c810..22fa94a 100755
--- a/db-import-archlinuxarm-pkg
+++ b/db-import-archlinuxarm-pkg
@@ -43,10 +43,6 @@ get_repo_content() {
 		sort -u
 }
 
-# Prints blacklisted packages
-get_blacklist() {
-	cut -d ':' -f 1 "${BLACKLIST_FILE}"
-}
 
 # repo
 # arch
@@ -58,7 +54,8 @@ get_repo_file() {
 init() {
 
 	# Get the blacklisted packages
-	blacklist=($(get_blacklist))
+	libreblacklist update
+	blacklist=($(libreblacklist get-pkg))
 	# Store all the whitelist files
 	whitelists=()
 
@@ -195,7 +192,7 @@ source "$(dirname "$(readlink -e "$0")")/db-import-archlinuxarm.conf"
 source "$(librelib messages)"
 
 # Check variables presence
-for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE; do
+for var in DBEXT FILESEXT mirror mirrorpath WORKDIR FTP_BASE; do
 	test -z "${!var}" && fatal_error "Empty %s" "${var}"
 done
 
diff --git a/db-import-archlinuxarm.conf b/db-import-archlinuxarm.conf
index 4a12a25..39dc0a4 100644
--- a/db-import-archlinuxarm.conf
+++ b/db-import-archlinuxarm.conf
@@ -2,8 +2,6 @@ ARMREPOS=('core' 'extra' 'community')
 PKGPOOLARM='pool/arch_gnu+linux_arm'
 OURARCHES=(armv7h)
 
-BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
-
 #mirror="mirror.yandex.ru"
 mirror="ftp.halifax.rwth-aachen.de"