From 8ef00f7fd95440b9ee377973463cdcfb359e67d37de10cc4904b4fbfdc8c4910 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 6 Mar 2024 12:48:17 +0000 Subject: [PATCH] - header_fixups.patch: added OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=292 --- header_fixups.patch | 14 ++++++++++++++ squid.changes | 1 + squid.spec | 2 ++ 3 files changed, 17 insertions(+) create mode 100644 header_fixups.patch diff --git a/header_fixups.patch b/header_fixups.patch new file mode 100644 index 0000000..68d30a5 --- /dev/null +++ b/header_fixups.patch @@ -0,0 +1,14 @@ +Index: squid-6.8/src/auth/basic/NIS/nis_support.h +=================================================================== +--- squid-6.8.orig/src/auth/basic/NIS/nis_support.h ++++ squid-6.8/src/auth/basic/NIS/nis_support.h +@@ -8,9 +8,6 @@ + #ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H + #define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H + +-#ifndef SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H +-#define SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H +- + extern char * get_nis_password(char *user, char *nisdomain, char *nismap); + + #endif /* SQUID_SRC_AUTH_BASIC_NIS_NIS_SUPPORT_H */ diff --git a/squid.changes b/squid.changes index a97a7de..577be5d 100644 --- a/squid.changes +++ b/squid.changes @@ -18,6 +18,7 @@ Wed Mar 6 12:02:14 UTC 2024 - Adam Majer - Remove incorrect beta version warning - squid.keyring: updated +- header_fixups.patch: added ------------------------------------------------------------------- Mon Feb 26 13:37:08 UTC 2024 - Dominique Leuenberger diff --git a/squid.spec b/squid.spec index 0d33847..59ce06c 100644 --- a/squid.spec +++ b/squid.spec @@ -51,6 +51,7 @@ Source17: tmpfilesdir.squid.conf Patch1: missing_installs.patch Patch2: old_nettle_compat.patch Patch3: harden_squid.service.patch +Patch4: header_fixups.patch BuildRequires: cppunit-devel BuildRequires: expat BuildRequires: fdupes @@ -107,6 +108,7 @@ accelerator. %setup -q cp %{SOURCE10} . %patch -P 3 -p1 +%patch -P4 -p1 # upstream patches after RELEASE perl -p -i -e 's|%{_prefix}/local/bin/perl|%{_bindir}/perl|' `find -name "*.pl"`