[projects/pld-ftp-admin] Pull local changes from admin server

[baggins]

commit efeb8b0b7065b7c1694d76cec79563c07a599470
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Feb 7 10:31:21 2025 +0100

    Pull local changes from admin server

 html/qa.php                 | 2 ++
 modules/sign.py             | 4 ++--
 shell/bash_profile          | 2 +-
 wwwbin/consistency-check.sh | 8 +++++++-
 4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/html/qa.php b/html/qa.php
index 4a74ff3..e8033d4 100644
--- a/html/qa.php
+++ b/html/qa.php
@@ -34,6 +34,8 @@ $reports = array(
 	"lint-PLD" => "rpmlint: main",
 	"lint-test" => "rpmlint: test",
 	"lint-ready" => "rpmlint: ready",
+
+	"main-vuln" => "main potential vulnerabilities",
 );
 
 function reports_selection($reports) {
diff --git a/modules/sign.py b/modules/sign.py
index eb31c2e..c53ee08 100644
--- a/modules/sign.py
+++ b/modules/sign.py
@@ -59,9 +59,9 @@ def signpkgs(files, password, force=False):
     child.logfile_read = sys.stderr
     # TODO: we need a smarter way to figuring out if rpm already stored password in gpg-agent
     try:
-        child.expect(u'Enter pass phrase:', timeout=30)
+        child.expect(u'Enter passphrase:', timeout=30)
         child.sendline(password)
-    except pexpect.exceptions.TIMEOUT:
+    except (pexpect.exceptions.TIMEOUT, pexpect.exceptions.EOF):
         print('WARN: rpm did not ask for password', file=sys.stderr)
     child.expect(pexpect.EOF, timeout=None)
     child.close()
diff --git a/shell/bash_profile b/shell/bash_profile
index 8221875..9528d40 100644
--- a/shell/bash_profile
+++ b/shell/bash_profile
@@ -2,7 +2,7 @@
 
 # identify via remote addr
 case "${SSH_CLIENT%% *}" in
-195.222.9.201) # glen ;)
+195.222.9.201|185.20.102.130) # glen ;)
 	export FTPADM=glen
 	;;
 193.0.96.*|2001:6a0:5001:*) # baggins
diff --git a/wwwbin/consistency-check.sh b/wwwbin/consistency-check.sh
index d12d1a3..44faec7 100755
--- a/wwwbin/consistency-check.sh
+++ b/wwwbin/consistency-check.sh
@@ -4,7 +4,7 @@ export LC_ALL=C
 
 filter_deps() {
 	boolean_deps="req \(.*\) not found"
-	common_deps="cpuinfo\(|uname\(release\)|-multilib-|\/eclipse\/|statifier|kernel-tools-perf-vdso"
+	common_deps="cpuinfo\(|uname\(release\)|-multilib-|/eclipse/|statifier|kernel-tools-perf-vdso"
 	x32_deps="libreoffice|nodejs|firefox|seamonkey|thunderbird"
 	if [ $1 = "x32" ]; then
 		grep -Ev "($boolean_deps|$common_deps|$x32_deps)"
@@ -69,6 +69,12 @@ gen_list() {
 	--ignore "libpurple-protocol-skype-*.x86_64" \
 	--ignore "nagios-plugin-check_cciss-*" \
 	--ignore "libpng1*" \
+	--ignore "icedtea*" \
+	--ignore "openjdk8-*" \
+	--ignore "openjdk9-*" \
+	--ignore "openjdk10-*" \
+	--ignore "java-gnu-classpath-*" \
+	--ignore "libxcrypt-compat-*" \
 	--verify=deps -Q "$@" | filter_deps $arch | group_deps | pkg2src "$@" | sort
 }
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-ftp-admin.git/commitdiff/efeb8b0b7065b7c1694d76cec79563c07a599470