summaryrefslogtreecommitdiffstats
path: root/libraries/miniupnpc/slackware-version.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/miniupnpc/slackware-version.patch')
-rw-r--r--libraries/miniupnpc/slackware-version.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/libraries/miniupnpc/slackware-version.patch b/libraries/miniupnpc/slackware-version.patch
index 36dc146d82..fb759bf092 100644
--- a/libraries/miniupnpc/slackware-version.patch
+++ b/libraries/miniupnpc/slackware-version.patch
@@ -1,15 +1,16 @@
-diff -Naur miniupnpc-1.6.orig/updateminiupnpcstrings.sh miniupnpc-1.6/updateminiupnpcstrings.sh
---- miniupnpc-1.6.orig/updateminiupnpcstrings.sh 2011-01-27 17:50:40.000000000 +0000
-+++ miniupnpc-1.6/updateminiupnpcstrings.sh 2011-12-04 20:55:22.313144966 +0000
-@@ -14,19 +14,11 @@
- OS_NAME=Debian
+--- a/updateminiupnpcstrings.sh 2023-08-23 17:42:05.225106104 -0700
++++ b/updateminiupnpcstrings.sh 2023-08-23 17:50:42.605604311 -0700
+@@ -26,21 +26,10 @@
OS_VERSION=`cat /etc/debian_version`
fi
+
-# use lsb_release (Linux Standard Base) when available
-LSB_RELEASE=`which lsb_release`
-if [ 0 -eq $? -a -x "${LSB_RELEASE}" ]; then
-- OS_NAME=`${LSB_RELEASE} -i -s`
-- OS_VERSION=`${LSB_RELEASE} -r -s`
+- # On NixOS, lsb_release returns strings such as "NixOS" (with quotes),
+- # so we need to stript them with the following xargs trick:
+- OS_NAME=`${LSB_RELEASE} -i -s | xargs echo`
+- OS_VERSION=`${LSB_RELEASE} -r -s | xargs echo`
- case $OS_NAME in
- Debian)
- #OS_VERSION=`${LSB_RELEASE} -c -s`
@@ -18,7 +19,6 @@ diff -Naur miniupnpc-1.6.orig/updateminiupnpcstrings.sh miniupnpc-1.6/updatemini
- #OS_VERSION=`${LSB_RELEASE} -c -s`
- ;;
- esac
-+
+# Slackware specific stuff.
+if [ -f /etc/slackware-version ]; then
+ OS_NAME=`cat /etc/slackware-version | cut -d' ' -f1`