From 6ba9572799f548ed53448ba945de4467ddd42955 Mon Sep 17 00:00:00 2001 From: "yangxiaoxuan@openanolis.org" Date: Mon, 21 Jun 2021 23:08:28 +0800 Subject: [PATCH] rebrand: rebrand to anolis Signed-off-by: yangxiaoxuan@openanolis.org Signed-off-by: hongwei-qin --- 0001-libreswan-anolis-rebrand-to-anolis.patch | 87 +++++++++++++++++++ libreswan.spec | 11 ++- 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 0001-libreswan-anolis-rebrand-to-anolis.patch diff --git a/0001-libreswan-anolis-rebrand-to-anolis.patch b/0001-libreswan-anolis-rebrand-to-anolis.patch new file mode 100644 index 0000000..21068dd --- /dev/null +++ b/0001-libreswan-anolis-rebrand-to-anolis.patch @@ -0,0 +1,87 @@ +From c0ae1f9070d386036a793d3e8eac7a787e7017a0 Mon Sep 17 00:00:00 2001 +From: "yangxiaoxuan@openanolis.org" +Date: Mon, 21 Jun 2021 22:48:03 +0800 +Subject: [PATCH] libreswan anolis rebrand to anolis + +--- + Makefile | 2 +- + mk/defaults/linux.mk | 2 +- + programs/barf/barf.in | 2 +- + testing/guestbin/docker-transmogrify | 8 +++++--- + 4 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index db230d4..bafddc2 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,7 @@ include ${LIBRESWANSRCDIR}/Makefile.inc + MAIN_RPM_VERSION = $(shell make showversion | sed "s/-.*//") + MAIN_RPM_PREVER = $(shell make showversion | sed -e "s/^.[^-]*-\([^-]*\)-\(.*\)/rc\1_\2/" -e "s/-/_/g") + MAIN_RPM_PREFIX = libreswan-$(MAIN_RPM_VERSION)$(MAIN_RPM_PREVER) +-MAIN_RPM_RHEL_PKG = $(shell rpm -qf /etc/redhat-release) ++MAIN_RPM_RHEL_PKG = $(shell rpm -qf /etc/anolis-release) + MAIN_RPM_RHEL_VERSION = $(shell echo $(MAIN_RPM_RHEL_PKG) | sed "s/.*-release-\(.\).*/\1/") + MAIN_RPM_SPECFILE = $(shell if [ -f /etc/fedora-release ]; then echo packaging/fedora/libreswan.spec; elif [ -n "$(MAIN_RPM_RHEL_VERSION)" ]; then echo packaging/rhel/$(MAIN_RPM_RHEL_VERSION)/libreswan.spec; else echo "unknown distro, cannot find spec file to use in packaging directory"; fi) + RHEL_LIKE= $(shell cat /etc/os-release | grep ID_LIKE | sed -e "s/ID_LIKE=//" -e 's/"//g' -e "s/ .*//") +diff --git a/mk/defaults/linux.mk b/mk/defaults/linux.mk +index c286a7d..56a3e20 100644 +--- a/mk/defaults/linux.mk ++++ b/mk/defaults/linux.mk +@@ -131,7 +131,7 @@ ifndef INITSYSTEM + INITSYSTEM=systemd + else ifneq ($(and $(wildcard /lib/systemd/systemd),$(wildcard /var/run/systemd)),) + INITSYSTEM=systemd +- else ifneq ($(and $(wildcard /sbin/start),$(wildcard /etc/redhat-release)),) ++ else ifneq ($(and $(wildcard /sbin/start),$(wildcard /etc/anolis-release)),) + # override for rhel/centos to use sysvinit + INITSYSTEM=sysvinit + else ifneq ($(wildcard /sbin/start),) +diff --git a/programs/barf/barf.in b/programs/barf/barf.in +index e76c62f..7a7a61a 100755 +--- a/programs/barf/barf.in ++++ b/programs/barf/barf.in +@@ -248,7 +248,7 @@ if [ -r /proc/config_built_with ]; then + cat /proc/config_built_with + fi + _________________________ distro-release +-for distro in /etc/redhat-release /etc/debian-release /etc/SuSE-release /etc/mandrake-release /etc/mandriva-release /etc/gentoo-release ++for distro in /etc/redhat-release /etc/anolis-release /etc/debian-release /etc/SuSE-release /etc/mandrake-release /etc/mandriva-release /etc/gentoo-release + do + if [ -f ${distro} ]; then + cat ${distro} +diff --git a/testing/guestbin/docker-transmogrify b/testing/guestbin/docker-transmogrify +index 0afa1f1..4dc7539 100755 +--- a/testing/guestbin/docker-transmogrify ++++ b/testing/guestbin/docker-transmogrify +@@ -34,7 +34,9 @@ macs['sunset'] = "12:00:00:ab:cd:01" + # conflicts with north + #macs['japan'] = "12:00:00:ab:cd:02" + +-if os.path.isfile("/etc/redhat-release"): ++if os.path.isfile("/etc/anolis-release"): ++ GUESTOS = "anolis" ++elif os.path.isfile("/etc/redhat-release"): + GUESTOS = "redhat" + elif os.path.isfile("/etc/debian_version"): + GUESTOS = "debian" +@@ -136,7 +138,7 @@ else: + if os.path.isfile(hostname_file): + shutil.copyfile(hostname_file, "/etc/hostname") + +-if GUESTOS == "redhat": ++if GUESTOS == "anolis": + + # these files are needed for systemd-networkd too + fnames = glob.glob("/testing/baseconfigs/all/etc/sysconfig/*") +@@ -216,7 +218,7 @@ for dbfile in glob.glob("/etc/ipsec.d/*.db"): + os.chmod(dbfile, 0o600) + + # SElinux fixup +-if GUESTOS == "redhat": ++if GUESTOS == "anolis": + output += "\n" + subprocess.getoutput("restorecon -R /etc/") + + # selinux does not like our /testing include files +-- +2.18.4 + diff --git a/libreswan.spec b/libreswan.spec index dac2503..77ec466 100644 --- a/libreswan.spec +++ b/libreswan.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global _hardened_build 1 # These are rpm macros and are 0 or 1 %global with_efence 0 @@ -37,7 +38,7 @@ Name: libreswan Summary: IPsec implementation with IKEv1 and IKEv2 keying protocols # version is generated in the release script Version: 4.5 -Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist} +Release: %{?prever:0.}1%{?prever:.%{prever}}%{anolis_release}%{?dist} License: GPLv2 Url: https://libreswan.org/ @@ -54,6 +55,10 @@ Patch3: libreswan-4.1-maintain-obsolete-keywords.patch Patch6: libreswan-4.3-1934186-config.patch Patch7: libreswan-4.4-ikev1-disable-diagnostics.patch +#Add by Anolis +Patch1000: 0001-libreswan-anolis-rebrand-to-anolis.patch +#End + BuildRequires: audit-libs-devel BuildRequires: bison BuildRequires: curl-devel @@ -113,6 +118,7 @@ Libreswan is based on Openswan-2.6.38 which in turn is based on FreeS/WAN-2.04 %patch6 -p1 %patch7 -p1 +%patch1000 -p1 # linking to freebl is not needed sed -i "s/-lfreebl //" mk/config.mk @@ -215,6 +221,9 @@ certutil -N -d sql:$tmpdir --empty-password %attr(0644,root,root) %doc %{_mandir}/*/* %changelog +* Mon Apr 18 2022 yangxiaoxuan - 4.5-1.0.1 +- Rebrand to anolis + * Thu Jan 13 2022 Daiki Ueno - 4.5-1 - Resolves: rhbz#2017352 Rebase libreswan to 4.5 - Resolves: rhbz#2036903 ikev1: disable diagnostics logging on receiving malformed packets -- Gitee