about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorc0bw3b <c0bw3b@users.noreply.github.com>2019-05-04 19:52:24 +0200
committerc0bw3b <c0bw3b@users.noreply.github.com>2019-05-04 19:52:24 +0200
commit9cb260d091f5a474ee70ddccc6b8ecad825a78dc (patch)
treebd916d0989e7ec64fa7a1fda00ce0d9e000afecf /pkgs/tools
parent01c27d6faf44ccd435069bcbe40785f9e0bfd9be (diff)
downloadnixlib-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar
nixlib-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.gz
nixlib-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.bz2
nixlib-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.lz
nixlib-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.xz
nixlib-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.tar.zst
nixlib-9cb260d091f5a474ee70ddccc6b8ecad825a78dc.zip
[treewide] delete unused patches
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch25
-rw-r--r--pkgs/tools/filesystems/ceph/fix-pythonpath.patch31
-rw-r--r--pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch36
-rw-r--r--pkgs/tools/networking/inadyn/remove-unused-macro.patch242
-rw-r--r--pkgs/tools/security/qdigidoc/qt511.patch62
-rw-r--r--pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch27
-rw-r--r--pkgs/tools/typesetting/tex/texlive/texlinks.patch15
7 files changed, 0 insertions, 438 deletions
diff --git a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch b/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
deleted file mode 100644
index cb2de6ad4f5b..000000000000
--- a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001
-From: "William A. Kennington III" <william@wkennington.com>
-Date: Sun, 21 Sep 2014 12:19:30 -0700
-Subject: [PATCH] Makefile-env: Don't force /sbin
-
----
- src/Makefile-env.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index f2ab655..bf8876e 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS =
- ceph_sbindir = $(sbindir)
- 
- # certain things go straight into /sbin, though!
--su_sbindir = /sbin
-+su_sbindir = $(sbindir)
- 
- # C/C++ tests to build will be appended to this
- check_PROGRAMS =
--- 
-2.1.0
-
diff --git a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch b/pkgs/tools/filesystems/ceph/fix-pythonpath.patch
deleted file mode 100644
index 7458a46aca15..000000000000
--- a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index e176596..384e230 100644
---- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -40,7 +40,7 @@ check_SCRIPTS =
- export VERBOSE = true
- 
- # python unit tests need to know where the scripts are located
--export PYTHONPATH=$(top_srcdir)/src/pybind
-+export PYTHONPATH+=:$(top_srcdir)/src/pybind
- 
- # when doing a debug build, make sure to make the targets
- if WITH_DEBUG
-diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am
-index 3e5ad03..66d6683 100644
---- a/src/ceph-detect-init/Makefile.am
-+++ b/src/ceph-detect-init/Makefile.am
-@@ -64,9 +64,10 @@ install-data-local::
- 	if test "$(DESTDIR)" ; then \
- 		if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \
- 			options=--install-layout=deb ; \
--		else \
--			options=--prefix=/usr ; \
- 		fi ; \
- 		root="--root=$(DESTDIR)" ; \
- 	fi ; \
--	python setup.py install $$root $$options
-+	if test "$(prefix)"; then \
-+		prefix="--prefix=$(prefix)" ; \
-+	fi ; \
-+	python setup.py install $$prefix $$root $$options
diff --git a/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch b/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
deleted file mode 100644
index 03277838e887..000000000000
--- a/pkgs/tools/networking/eggdrop/b34a33255f56bbd2317c26da12d702796d67ed50.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b34a33255f56bbd2317c26da12d702796d67ed50 Mon Sep 17 00:00:00 2001
-From: Geo Van Osterom <george.vo@alum.rpi.edu>
-Date: Thu, 22 Oct 2015 00:12:42 -0400
-Subject: [PATCH] Fix gcc 5 compile errors
-
----
- src/net.c     | 2 +-
- src/tclhash.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/net.c b/src/net.c
-index a1937de..c369fda 100644
---- a/src/net.c
-+++ b/src/net.c
-@@ -560,7 +560,7 @@ int open_address_listen(sockname_t *addr)
- /* Returns a socket number for a listening socket that will accept any
-  * connection -- port # is returned in port
-  */
--inline int open_listen(int *port)
-+extern inline int open_listen(int *port)
- {
-   int sock;
-   sockname_t name;
-diff --git a/src/tclhash.c b/src/tclhash.c
-index 9729acb..22c3d05 100644
---- a/src/tclhash.c
-+++ b/src/tclhash.c
-@@ -113,7 +113,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl)
-   nfree(tl);
- }
-
--inline void garbage_collect_tclhash(void)
-+extern inline void garbage_collect_tclhash(void)
- {
-   tcl_bind_list_t *tl, *tl_next, *tl_prev;
-   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
diff --git a/pkgs/tools/networking/inadyn/remove-unused-macro.patch b/pkgs/tools/networking/inadyn/remove-unused-macro.patch
deleted file mode 100644
index 0ee6a5d7757c..000000000000
--- a/pkgs/tools/networking/inadyn/remove-unused-macro.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From b5c70461822003238784ff56f4c8eead10cfc2c1 Mon Sep 17 00:00:00 2001
-From: Joachim Nilsson <troglobit@gmail.com>
-Date: Sun, 2 Jul 2017 21:01:33 +0200
-Subject: [PATCH] Remove UNUSED() macro and disable the compiler warning
- instead
-
-Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
-
-diff --git a/plugins/common.c b/plugins/common.c
-index 55c1ac3..9e7ba7b 100644
---- a/plugins/common.c
-+++ b/plugins/common.c
-@@ -64,7 +64,7 @@ int common_request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  * DynDNS response validator -- common to many other DDNS providers as well
-  *  'good' or 'nochg' are the good answers,
-  */
--int common_response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+int common_response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *body = trans->rsp_body;
- 
-diff --git a/plugins/ddnss.c b/plugins/ddnss.c
-index fea41e9..5184db0 100644
---- a/plugins/ddnss.c
-+++ b/plugins/ddnss.c
-@@ -60,7 +60,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/dhis.c b/plugins/dhis.c
-index 11edd2c..b6e8e0b 100644
---- a/plugins/dhis.c
-+++ b/plugins/dhis.c
-@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *rsp = trans->rsp_body;
- 
-diff --git a/plugins/dnsexit.c b/plugins/dnsexit.c
-index c456f38..4bf0a08 100644
---- a/plugins/dnsexit.c
-+++ b/plugins/dnsexit.c
-@@ -62,7 +62,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	int   code = -1;
- 	char *tmp;
-diff --git a/plugins/dtdns.c b/plugins/dtdns.c
-index e7996fe..38f0977 100644
---- a/plugins/dtdns.c
-+++ b/plugins/dtdns.c
-@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/duckdns.c b/plugins/duckdns.c
-index 9ca46ae..66d9c25 100755
---- a/plugins/duckdns.c
-+++ b/plugins/duckdns.c
-@@ -78,7 +78,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/duiadns.c b/plugins/duiadns.c
-index 7c4ced3..7dc09c9 100644
---- a/plugins/duiadns.c
-+++ b/plugins/duiadns.c
-@@ -58,7 +58,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/dynv6-ipv4.c b/plugins/dynv6-ipv4.c
-index 5dab9f1..f37215a 100644
---- a/plugins/dynv6-ipv4.c
-+++ b/plugins/dynv6-ipv4.c
-@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/dynv6.c b/plugins/dynv6.c
-index 84b7c40..03b1b4c 100644
---- a/plugins/dynv6.c
-+++ b/plugins/dynv6.c
-@@ -59,7 +59,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/easydns.c b/plugins/easydns.c
-index c9d8059..7718c56 100644
---- a/plugins/easydns.c
-+++ b/plugins/easydns.c
-@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- /*
-  * NOERROR is the OK code here
-  */
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/freedns.c b/plugins/freedns.c
-index 2c56ca4..2a2991f 100644
---- a/plugins/freedns.c
-+++ b/plugins/freedns.c
-@@ -134,7 +134,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-     fail blabla and n.n.n.n
-     are the good answers. We search our own IP address in response and that's enough.
- */
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/generic.c b/plugins/generic.c
-index 8f23de4..3cee1f2 100644
---- a/plugins/generic.c
-+++ b/plugins/generic.c
-@@ -238,7 +238,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 	return ret;
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 	size_t i;
-diff --git a/plugins/giradns.c b/plugins/giradns.c
-index 2d6043e..ea19f77 100644
---- a/plugins/giradns.c
-+++ b/plugins/giradns.c
-@@ -57,7 +57,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->server_name.name, info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/sitelutions.c b/plugins/sitelutions.c
-index c484a62..611c865 100644
---- a/plugins/sitelutions.c
-+++ b/plugins/sitelutions.c
-@@ -64,7 +64,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- 			info->user_agent);
- }
- 
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/tunnelbroker.c b/plugins/tunnelbroker.c
-index 1f58990..17eb2b9 100644
---- a/plugins/tunnelbroker.c
-+++ b/plugins/tunnelbroker.c
-@@ -77,7 +77,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  * Hurricate Electric IPv6 tunnelbroker specific response validator
-  * Own IP address and 'already in use' are the good answers.
-  */
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *alias)
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *resp = trans->rsp_body;
- 
-diff --git a/plugins/tzo.c b/plugins/tzo.c
-index 0a36e87..eba3da4 100644
---- a/plugins/tzo.c
-+++ b/plugins/tzo.c
-@@ -66,7 +66,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
- }
- 
- /* TZO specific response validator. */
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	int code = -1;
- 
-diff --git a/plugins/zerigo.c b/plugins/zerigo.c
-index 4fb29ab..cc71348 100644
---- a/plugins/zerigo.c
-+++ b/plugins/zerigo.c
-@@ -70,7 +70,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  * Server error
-  *  Status: 5xx
-  */
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	char *ptr, *rsp = trans->rsp_body;
- 
-diff --git a/plugins/zoneedit.c b/plugins/zoneedit.c
-index 7178b9c..464ed66 100644
---- a/plugins/zoneedit.c
-+++ b/plugins/zoneedit.c
-@@ -65,7 +65,7 @@ static int request(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
-  *  CODE=200, 201
-  *  CODE=707, for duplicated updates
-  */
--static int response(http_trans_t *trans, ddns_info_t *UNUSED(info), ddns_alias_t *UNUSED(alias))
-+static int response(http_trans_t *trans, ddns_info_t *info, ddns_alias_t *alias)
- {
- 	int code = -1;
- 
diff --git a/pkgs/tools/security/qdigidoc/qt511.patch b/pkgs/tools/security/qdigidoc/qt511.patch
deleted file mode 100644
index 1300422d353e..000000000000
--- a/pkgs/tools/security/qdigidoc/qt511.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/client/Application.cpp b/client/Application.cpp
-index fce9eee..cec84ae 100644
---- a/client/Application.cpp
-+++ b/client/Application.cpp
-@@ -54,6 +54,7 @@
- #include <QtGui/QFileOpenEvent>
- #include <QtNetwork/QNetworkProxy>
- #include <QtNetwork/QSslConfiguration>
-+#include <QtWidgets/QAction>
- #include <QtWidgets/QMessageBox>
- #include <QtWidgets/QProgressBar>
- #include <QtWidgets/QProgressDialog>
-diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp
-index 06d561e..b4aa0d5 100644
---- a/client/MainWindow.cpp
-+++ b/client/MainWindow.cpp
-@@ -44,6 +44,8 @@
- #include <QtPrintSupport/QPrinter>
- #include <QtPrintSupport/QPrinterInfo>
- #include <QtPrintSupport/QPrintPreviewDialog>
-+#include <QtWidgets/QActionGroup>
-+#include <QtWidgets/QButtonGroup>
- #include <QtWidgets/QCompleter>
- #include <QtWidgets/QMessageBox>
- 
-diff --git a/client/MainWindow.h b/client/MainWindow.h
-index b9515dd..661418a 100644
---- a/client/MainWindow.h
-+++ b/client/MainWindow.h
-@@ -24,6 +24,7 @@
- #include <QtCore/QStringList>
- 
- class DigiDoc;
-+class QActionGroup;
- class QPrinter;
- 
- class MainWindow: public QWidget, private Ui::MainWindow
-diff --git a/crypto/MainWindow.cpp b/crypto/MainWindow.cpp
-index c3d3115..f12d984 100644
---- a/crypto/MainWindow.cpp
-+++ b/crypto/MainWindow.cpp
-@@ -35,6 +35,8 @@
- #include <QtGui/QDesktopServices>
- #include <QtGui/QDragEnterEvent>
- #include <QtNetwork/QSslKey>
-+#include <QtWidgets/QActionGroup>
-+#include <QtWidgets/QButtonGroup>
- #include <QtWidgets/QMessageBox>
- #include <QtWidgets/QProgressBar>
- #include <QtWidgets/QProgressDialog>
-diff --git a/crypto/MainWindow.h b/crypto/MainWindow.h
-index 16dbec4..01ec99f 100644
---- a/crypto/MainWindow.h
-+++ b/crypto/MainWindow.h
-@@ -21,6 +21,7 @@
- 
- #include "ui_MainWindow.h"
- 
-+class QActionGroup;
- class CKey;
- class CryptoDoc;
- 
diff --git a/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch b/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
deleted file mode 100644
index f1233a04b7a6..000000000000
--- a/pkgs/tools/security/sshguard/0001-Remove-the-unnecessary-from-ipset-cmds.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 11f0d238d3149c31c4440b8f6a58fe6a00b82d3a Mon Sep 17 00:00:00 2001
-From: Daniel Aleksandersen <code@daniel.priv.no>
-Date: Mon, 13 Mar 2017 16:29:33 +0100
-Subject: [PATCH 1/3] Remove the unnecessary = from ipset cmds
-
----
- src/fw/sshg-fw-ipset.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/fw/sshg-fw-ipset.sh b/src/fw/sshg-fw-ipset.sh
-index 510bc2c..dc7f86b 100644
---- a/src/fw/sshg-fw-ipset.sh
-+++ b/src/fw/sshg-fw-ipset.sh
-@@ -3,8 +3,8 @@
- # This file is part of SSHGuard.
- 
- fw_init() {
--    ipset -quiet create -exist sshguard4 hash:ip family=inet
--    ipset -quiet create -exist sshguard6 hash:ip family=inet6
-+    ipset -quiet create -exist sshguard4 hash:ip family inet
-+    ipset -quiet create -exist sshguard6 hash:ip family inet6
- }
- 
- fw_block() {
--- 
-2.10.0
-
diff --git a/pkgs/tools/typesetting/tex/texlive/texlinks.patch b/pkgs/tools/typesetting/tex/texlive/texlinks.patch
deleted file mode 100644
index 613fa819e12a..000000000000
--- a/pkgs/tools/typesetting/tex/texlive/texlinks.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't overwrite already existing files!
-
-diff --git a/texmf-dist/scripts/texlive/texlinks.sh b/texmf-dist/scripts/texlive/texlinks.sh
-index 91540ea..9b1d7ed 100755
---- a/texmf-dist/scripts/texlive/texlinks.sh
-+++ b/texmf-dist/scripts/texlive/texlinks.sh
-@@ -157,7 +157,7 @@ install_link()
-       verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
-       ;;
-     *)
--      test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
-+      test ! -f "$src" &&
-         rm -f "$src"
-   
-       if test -f "$src"; then