diff --git a/.gitignore b/.gitignore index 0699ad1..fc1c13d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /lldpd-0.9.7.tar.gz /lldpd-0.9.8.tar.gz /lldpd-1.0.1.tar.gz -/lldpd-1.0.4.tar.gz +/lldpd-1.0.4-free.tar.gz diff --git a/lldpd-cleanup.sh b/lldpd-cleanup.sh new file mode 100755 index 0000000..5a09592 --- /dev/null +++ b/lldpd-cleanup.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# Process a lldpd tarball to remove proprietary source code. +# +# Yaakov Selkowitz - 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 + +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 a904d0f..522b489 100644 --- a/lldpd.spec +++ b/lldpd.spec @@ -10,18 +10,21 @@ Name: lldpd Version: 1.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: ISC-licensed implementation of LLDP License: ISC URL: https://%{gh_owner}.github.io/%{name}/ -Source0: https://media.luffy.cx/files/lldpd/lldpd-%{version}.tar.gz +# Upstream https://media.luffy.cx/files/lldpd/lldpd-%{version}.tar.gz +Source0: lldpd-%{version}-free.tar.gz Source1: %{name}-fedora.service Source2: %{name}-tmpfiles Source3: %{name}-fedora.sysconfig Source4: %{name}-el6.init Source5: %{name}-el7.service +Source100: lldpd-cleanup.sh + BuildRequires: gcc BuildRequires: readline-devel BuildRequires: check-devel @@ -173,6 +176,9 @@ fi %changelog +* Mon Jul 12 2021 Aaron Conole - 1.0.4-9 +- Strip ASL components (#1982259) + * Tue Jun 22 2021 Mohan Boddu - 1.0.4-8 - Rebuilt for RHEL 9 BETA for openssl 3.0 Related: rhbz#1971065 diff --git a/sources b/sources index 324eb0a..bfe9266 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lldpd-1.0.4.tar.gz) = a5537acf2ca3be22a70124101c1c70713e655aee8d6344d25901aa5eff1efd5afb221364b9c92388bf3edf74c4cd5841fb7c9ba77745ac3cd80051bc0bad1ac9 +SHA512 (lldpd-1.0.4-free.tar.gz) = ae72f6e9dd6c3ea86c3eae8ff03ccc4a1271dce324504fb7ca42b718014062a27e94fb46d2fc8ff653c9c6731a052b5be4459f8d7bb19cb26f2bb044eda6da5c