Revert "xorg-iceauth: attempt 2 to disable hardlinking"

This reverts commit 17d13c0786.
This commit is contained in:
Leonid Pliushch 2020-01-05 16:09:35 +02:00 committed by Yaksh Bariya
parent 17d13c0786
commit 89352156d5
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
2 changed files with 6 additions and 10 deletions

View File

@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="ICE authority file utility"
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="Leonid Plyushch <leonid.plyushch@gmail.com>"
TERMUX_PKG_VERSION=1.0.8
TERMUX_PKG_REVISION=5
TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=https://www.x.org/archive/individual/app/iceauth-$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=25b94613173a6dd28d7b18d9479194aae3d9392f5a4a072f499bd48d3ca00740
TERMUX_PKG_DEPENDS="libice"

View File

@ -1,16 +1,12 @@
diff -uNr iceauth-1.0.8/process.c iceauth-1.0.8.mod/process.c
--- iceauth-1.0.8/process.c 2018-03-05 06:06:49.000000000 +0200
+++ iceauth-1.0.8.mod/process.c 2020-01-05 16:05:53.318868140 +0200
@@ -686,12 +686,7 @@
+++ iceauth-1.0.8.mod/process.c 2020-01-05 15:31:47.723588417 +0200
@@ -686,7 +686,7 @@
ProgramName, temp_name);
} else {
(void) unlink (iceauth_filename);
-#if defined(WIN32) || defined(__UNIXOS2__)
+#if defined(WIN32) || defined(__UNIXOS2__) || defined(__ANDROID__)
if (rename(temp_name, iceauth_filename) == -1)
-#else
- /* Attempt to rename() if link() fails, since this may be on a FS that does not support hard links */
- if (link (temp_name, iceauth_filename) == -1 && rename(temp_name, iceauth_filename) == -1)
-#endif
{
fprintf (stderr,
"%s: unable to link authority file %s, use %s\n",
#else
/* Attempt to rename() if link() fails, since this may be on a FS that does not support hard links */