Use shorter pathname for COPR RPM build

If the path of SOCKET_WRAPPER_DIR is too long, it doesn't fit in the
sun_path field of the sockaddr_un, and libsocket_wrapper gets very
unhappy, reporting 'Too many unix sockets'. Despite actually only ever
trying *one* path over and over again 1024 times due to truncation.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/.copr/Makefile b/.copr/Makefile
index 5553d2c1783e8e2d64cc5e8a342f8333efa8aff4..d83f8033a2a0986226be8aed999216cccc77d03c 100644 (file)
--- a/.copr/Makefile
+++ b/.copr/Makefile
@@ -18,7 +18,7 @@ srpm: /usr/bin/git
                tarprefix=$$(sed -n '/^%global tagver /s/.* //p' $(TARGET).spec); \
                tarname=$${tarprefix}; \
        fi; \
-       git archive --prefix=openconnect-$${tarprefix}/ HEAD -o .copr/openconnect-$${tarname}.tar.gz
+       git archive --prefix=openconnect-$${tarname}/ HEAD -o .copr/openconnect-$${tarname}.tar.gz
        rpmbuild -bs $(TARGET).spec --define "_sourcedir .copr" --define "_srcrpmdir $(outdir)"
 
 /usr/bin/git:

diff --git a/mingw-openconnect.spec.in b/mingw-openconnect.spec.in
index 315a24d49351eb88d17cb9d623c47c41b135d135..063ae79ad0fc06d2977d0e3c7f32ecf42f56c758 100644 (file)
--- a/mingw-openconnect.spec.in
+++ b/mingw-openconnect.spec.in
@@ -79,7 +79,7 @@ The OpenConnect multiprotocol VPN client library, cross-compiled for MinGW.
 
 %prep
 %if 0%{?gitsnapshot}
-%setup -q -n openconnect-%{snapcommit}
+%setup -q -n openconnect-%{shortcommit}
 NOCONFIGURE=x ./autogen.sh
 %else
 %gpg_verify

diff --git a/openconnect.spec.in b/openconnect.spec.in
index 945dcfb12b2e1407e0c43777f9fbed40d2460a74..049708ffde448813856e54b5b5d914d2866e2e56 100644 (file)
--- a/openconnect.spec.in
+++ b/openconnect.spec.in
@@ -102,7 +102,7 @@ for NetworkManager etc.
 %include %SOURCE3
 %prep
 %if 0%{?gitsnapshot}
-%setup -q -n %{name}-%{snapcommit}
+%setup -q -n %{name}-%{shortcommit}
 NOCONFIGURE=x ./autogen.sh
 %else
 %gpg_verify