From 517ea8539bb7c1f794c381b22a2a69aa51c60692 Mon Sep 17 00:00:00 2001
From: Hangbin Liu <haliu@redhat.com>
Date: Wed, 24 Apr 2024 11:10:54 +0800
Subject: [PATCH] Update for PELC reviews

Rebuild and fix issues with APSL/ASL licensing.
Also rebase to 1.0.18

Resolves: RHELMISC-4345

Signed-off-by: Hangbin Liu <haliu@redhat.com>
---
 lldpd-cleanup.sh | 32 ++++++++++++++++++++++++++++++++
 lldpd.spec       | 15 +++++++++------
 sources          |  2 +-
 3 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100755 lldpd-cleanup.sh

diff --git a/lldpd-cleanup.sh b/lldpd-cleanup.sh
new file mode 100755
index 0000000..9917c96
--- /dev/null
+++ b/lldpd-cleanup.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Process a lldpd tarball to remove proprietary source code.
+#
+# Yaakov Selkowitz <yselkowi@redhat.com> - 2021
+#
+
+SOURCE="$1"
+NEW_SOURCE=`echo $SOURCE | sed 's/\.tar\.gz/-free&/'`
+DIRECTORY=`echo $SOURCE | sed 's/\.tar\.gz//'`
+
+error()
+{
+	MESSAGE=$1
+	echo $MESSAGE
+	exit 1
+}
+
+rm -rf $DIRECTORY
+tar xzf $SOURCE || error "Cannot unpack $SOURCE"
+pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\""
+
+echo "Remove proprietary source files"
+find include/osx -type f -delete
+find debian -type f -delete
+
+echo
+
+popd > /dev/null
+
+tar czf $NEW_SOURCE $DIRECTORY
+echo "$NEW_SOURCE is ready to use"
diff --git a/lldpd.spec b/lldpd.spec
index 8a2d081..682a6d8 100644
--- a/lldpd.spec
+++ b/lldpd.spec
@@ -1,16 +1,17 @@
 Name:     lldpd
-Version:  1.0.16
-Release:  6%{?dist}
+Version:  1.0.18
+Release:  1%{?dist}
 Summary:  ISC-licensed implementation of LLDP
 
 License:  ISC
-URL:      https://github.com/lldpd/
-Source0:  https://github.com/lldpd/lldpd/archive/v%{version}/%{name}-%{version}.tar.gz
+URL:      https://%{name}.github.io/
+Source0:  %{name}-%{version}-free.tar.gz
 Source1:  %{name}-fedora.service
 Source2:  %{name}-tmpfiles
 Source3:  %{name}-fedora.sysconfig
 Source4:  %{name}-systemd-sysusers.conf
-Patch1:   lldpd-configure-c99.patch
+
+Source100:  %{name}-cleanup.sh
 
 BuildRequires: check-devel
 BuildRequires: gcc
@@ -40,7 +41,6 @@ Summary: %{summary}
 %prep
 %autosetup -p1
 
-
 %build
 %configure --disable-static --with-snmp --disable-silent-rules \
   --with-privsep-user=%{name} --with-privsep-group=%{name} \
@@ -114,6 +114,9 @@ exit 0
 
 
 %changelog
+* Wed Arp 24 2024 Hangbin Liu <haliu@redhat.com> - 1.0.18-1
+- Strip ASL/APSL components (RHELMISC-4345)
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.16-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index e938795..afe986c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lldpd-1.0.16.tar.gz) = 4abd25d1d7325f0a963518d916139f39b9250c37dfd918819019cabaafcdbedbfa03c78da80d36a09a0f4b1d79d4ee5e8aee1d10596bcd5710cd0c1181ba27c1
+SHA512 (lldpd-1.0.18-free.tar.gz) = be9327a3b37abf01e239be97bbcbcbefdf6554cddc45ae3c18e1c5c2d1dd6607b3dd6bda1ccc2c5e65a83b9839660ba26322baa582b27a613e829c38a94e3686