* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. afd8dc466b3a653adf12830806d7b964c9b29500
@ 2022-03-22 17:36 Peter Müller
0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2022-03-22 17:36 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 11114 bytes --]
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 "IPFire 2.x development tree".
The branch, next has been updated
via afd8dc466b3a653adf12830806d7b964c9b29500 (commit)
via b5abd5ccd3ac4835bdb6e5a1c49d359f50635e68 (commit)
via 90f03efea533d6277777431143dfbbb22dab03f0 (commit)
from fa0a7c038c9191c35b85b1cc78ee60eb81548a79 (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 afd8dc466b3a653adf12830806d7b964c9b29500
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Mar 21 21:30:57 2022 +0000
Nmap: Update to 7.92
Please refer to https://nmap.org/changelog#7.92 for the changelog of
this version; it is too long to include it here.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b5abd5ccd3ac4835bdb6e5a1c49d359f50635e68
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Tue Mar 22 17:35:11 2022 +0000
Core Update 166: There is no need for /dev/null in that GPG call
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
commit 90f03efea533d6277777431143dfbbb22dab03f0
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date: Mon Mar 21 18:56:06 2022 +0000
Core Update 166: Introduce new 2022 Pakfire key
Cc: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/pakfire | 1 +
config/rootfiles/core/166/filelists/pakfire | 1 +
config/rootfiles/core/166/update.sh | 7 ++--
config/rootfiles/packages/nmap | 7 ++--
lfs/nmap | 8 ++---
src/initscripts/system/pakfire | 2 +-
src/pakfire/pakfire-2022.key | 52 +++++++++++++++++++++++++++++
7 files changed, 66 insertions(+), 12 deletions(-)
create mode 120000 config/rootfiles/core/166/filelists/pakfire
create mode 100644 src/pakfire/pakfire-2022.key
Difference in files:
diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire
index bd5559597..b2a10cf37 100644
--- a/config/rootfiles/common/pakfire
+++ b/config/rootfiles/common/pakfire
@@ -7,6 +7,7 @@ opt/pakfire/db/rootfiles
#opt/pakfire/pakfire.conf
opt/pakfire/etc/pakfire.conf
opt/pakfire/pakfire-2018.key
+opt/pakfire/pakfire-2022.key
#opt/pakfire/lib
opt/pakfire/lib/functions.pl
opt/pakfire/lib/functions.sh
diff --git a/config/rootfiles/core/166/filelists/pakfire b/config/rootfiles/core/166/filelists/pakfire
new file mode 120000
index 000000000..d5b1d0d03
--- /dev/null
+++ b/config/rootfiles/core/166/filelists/pakfire
@@ -0,0 +1 @@
+../../../common/pakfire
\ No newline at end of file
diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh
index a6cfa9fc3..531be57f8 100644
--- a/config/rootfiles/core/166/update.sh
+++ b/config/rootfiles/core/166/update.sh
@@ -297,9 +297,10 @@ rm -rvf \
/var/lib/GeoIP
# Delete old 2007 Pakfire key from GPG keyring
-export GNUPGHOME="/opt/pakfire/etc/.gnupg"
-gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
-unset GNUPGHOME
+GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
+
+# Add new 2022 Pakfire key to GPG keyring
+GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --import /opt/pakfire/pakfire-2022.key
# Stop services
/etc/init.d/ipsec stop
diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap
index 7c6b0ee83..18034fd82 100644
--- a/config/rootfiles/packages/nmap
+++ b/config/rootfiles/packages/nmap
@@ -16,8 +16,6 @@ usr/bin/nping
#usr/share/man/pl
#usr/share/man/pl/man1
#usr/share/man/pl/man1/nmap.1
-#usr/share/man/pt_BR
-#usr/share/man/pt_BR/man1
#usr/share/man/pt_BR/man1/nmap.1
#usr/share/man/pt_PT
#usr/share/man/pt_PT/man1
@@ -25,8 +23,6 @@ usr/bin/nping
#usr/share/man/ro
#usr/share/man/ro/man1
#usr/share/man/ro/man1/nmap.1
-#usr/share/man/ru
-#usr/share/man/ru/man1
#usr/share/man/ru/man1/nmap.1
#usr/share/man/sk
#usr/share/man/sk/man1
@@ -619,6 +615,7 @@ usr/share/nmap/scripts/mysql-vuln-cve2012-2122.nse
usr/share/nmap/scripts/nat-pmp-info.nse
usr/share/nmap/scripts/nat-pmp-mapport.nse
usr/share/nmap/scripts/nbd-info.nse
+usr/share/nmap/scripts/nbns-interfaces.nse
usr/share/nmap/scripts/nbstat.nse
usr/share/nmap/scripts/ncp-enum-users.nse
usr/share/nmap/scripts/ncp-serverinfo.nse
@@ -644,6 +641,7 @@ usr/share/nmap/scripts/ntp-monlist.nse
usr/share/nmap/scripts/omp2-brute.nse
usr/share/nmap/scripts/omp2-enum-targets.nse
usr/share/nmap/scripts/omron-info.nse
+usr/share/nmap/scripts/openflow-info.nse
usr/share/nmap/scripts/openlookup-info.nse
usr/share/nmap/scripts/openvas-otp-brute.nse
usr/share/nmap/scripts/openwebnet-discovery.nse
@@ -662,6 +660,7 @@ usr/share/nmap/scripts/pjl-ready-message.nse
usr/share/nmap/scripts/pop3-brute.nse
usr/share/nmap/scripts/pop3-capabilities.nse
usr/share/nmap/scripts/pop3-ntlm-info.nse
+usr/share/nmap/scripts/port-states.nse
usr/share/nmap/scripts/pptp-version.nse
usr/share/nmap/scripts/puppet-naivesigning.nse
usr/share/nmap/scripts/qconn-exec.nse
diff --git a/lfs/nmap b/lfs/nmap
index 926912b32..6c9f44683 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -26,7 +26,7 @@ include Config
SUMMARY = Network exploration tool and security scanner
-VER = 7.91
+VER = 7.92
THISAPP = nmap-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nmap
-PAK_VER = 13
+PAK_VER = 14
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 239cef725863ab454590a1bb8793b72b
+$(DL_FILE)_MD5 = 849f7298a786ce4cd5728db989cff763
install : $(TARGET)
diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire
index 1305bda48..9b3c043e9 100644
--- a/src/initscripts/system/pakfire
+++ b/src/initscripts/system/pakfire
@@ -27,7 +27,7 @@ export GNUPGHOME="/opt/pakfire/etc/.gnupg"
case "${1}" in
start)
boot_mesg "Setting up Pakfire Package Manager..."
- gpg --import /opt/pakfire/pakfire-2018.key &>/dev/null
+ gpg --import /opt/pakfire/pakfire-2018.key /opt/pakfire/pakfire-2022.key &>/dev/null
evaluate_retval
;;
diff --git a/src/pakfire/pakfire-2022.key b/src/pakfire/pakfire-2022.key
new file mode 100644
index 000000000..bd85dab38
--- /dev/null
+++ b/src/pakfire/pakfire-2022.key
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+LYmcvOchLc+rTl8/4TMFYAzxKA==
+=kuwW
+-----END PGP PUBLIC KEY BLOCK-----
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-22 17:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-22 17:36 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. afd8dc466b3a653adf12830806d7b964c9b29500 Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox