From 4ec5d19a03652722953cf45f70998d426ca172efbd048451e227a585a0bc8bd7 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 22 Jan 2016 12:58:04 +0000 Subject: [PATCH] Accepting request 355367 from home:AndreasStieger:branches:filesystems fuse 2.9.5 OBS-URL: https://build.opensuse.org/request/show/355367 OBS-URL: https://build.opensuse.org/package/show/filesystems/fuse?expand=0&rev=60 --- fuse-2.9.4.tar.gz | 3 -- fuse-2.9.5.tar.gz | 3 ++ fuse-2.9.5.tar.gz.asc | 20 +++++++++++ fuse.changes | 9 +++++ fuse.keyring | 77 +++++++++++++++++++++++++++++++++++++++++++ fuse.spec | 65 +++++++++++++++++++----------------- 6 files changed, 143 insertions(+), 34 deletions(-) delete mode 100644 fuse-2.9.4.tar.gz create mode 100644 fuse-2.9.5.tar.gz create mode 100644 fuse-2.9.5.tar.gz.asc create mode 100644 fuse.keyring diff --git a/fuse-2.9.4.tar.gz b/fuse-2.9.4.tar.gz deleted file mode 100644 index d44bfff..0000000 --- a/fuse-2.9.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6be9c0bff6af8c677414935f31699ea5a7f8f5f791cfa5205be02ea186b97ce1 -size 577282 diff --git a/fuse-2.9.5.tar.gz b/fuse-2.9.5.tar.gz new file mode 100644 index 0000000..5e99398 --- /dev/null +++ b/fuse-2.9.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:579f371cc5ffc1afca7057512bf7d52988a9ede57859a7c55e5b9f72435cdbb5 +size 565245 diff --git a/fuse-2.9.5.tar.gz.asc b/fuse-2.9.5.tar.gz.asc new file mode 100644 index 0000000..f353fa3 --- /dev/null +++ b/fuse-2.9.5.tar.gz.asc @@ -0,0 +1,20 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQKgBAABCgCKBQJWl/W8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFRDMxNzkxQjJDNUMxNjEzQUYzODhCOEFE +MTEzRkNBQzNDNEU1OTlGIxpodHRwOi8vd3d3LnJhdGgub3JnL2dwZ3BvbGljeS5o +dG1sAAoJENET/Kw8TlmfeugP/0qV794Rj1ubp20h1AIRpw9VMH8I3be5YnKHb8hg +Pi+dv1IjbXvaA4vfFbby33pLCjafWnXJ6aru4UzSB0QekBvGm2Pmrm+iUfrQVcKt +WFKmCtDAtUoLnu8niWJFxvPvsMpbjmRwfJagtr9dQaHNDamdGTw69EChq+wIPJwc +5LCNxI7n26LXIvfvuHgxzUArpJMgcK5q3D5mb3nCuwz45+CmPz0o197uv2/xTsOT +39bbXMyn7Fn14TK86LBJaQIoSMiV6FllCe5+Bjj2WOCzmOyMafj8OxC+CpVh78bY +y4POH1s6v4WMDI7n25f6Fbh8/j895XcCTDW/Ri00yUosvWsRWoYVvtMn4uaMu0Wj +enR3d8lb+Agh6DU35QqvnSbj1Y3vHIF1e+7HDXDjgoQvazitMCOcDbrVOfw/8CE1 +Eo1HAml0eWYY+EM5F2KF87XwL5heIQ9OvGyWSH/0y4UpMjsyDCU5ZtNrMQE3zMbQ +sSwGyQTcgIsUC98Q2FoV5ApA6CQDajdPi7Ad33iqVso1e8EYyVi0nH1lkUYgBlnd +AcGG7081N2KTE1IWxrcgmYLUgbhRCqRrj3lSdn1Qi253LOLtrtJdM8JoVhTix/Qp +YKx2X3Hq9MKnvNMtA7rF4tssZt3NzLeSeApz4SaJDzE9+CYvkvMcXvVWwLtUvWvU +8VO4 +=CR/0 +-----END PGP SIGNATURE----- diff --git a/fuse.changes b/fuse.changes index 77b37e2..5eed588 100644 --- a/fuse.changes +++ b/fuse.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 22 12:04:12 UTC 2016 - astieger@suse.com + +- fuse 2.9.5: + * fix warning in mount.c:receive_fd(). + * fix possible memory leak. + * new upstream project and source URL + * add new maintainer keyring and verify source signature + ------------------------------------------------------------------- Fri May 22 09:38:26 UTC 2015 - mszeredi@suse.cz diff --git a/fuse.keyring b/fuse.keyring new file mode 100644 index 0000000..7ae8ae0 --- /dev/null +++ b/fuse.keyring @@ -0,0 +1,77 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.5+ +Comment: Hostname: keys2.kfwebs.net + +mQINBFMiefoBEADYa1ZUqR/3YDqaf2UGpd9kNfKAY3TAR+xTcTYBKWTkJEy4cX2bccSEOf7E +f1w0va+WgBwDUAllf+x21UFOWnPnqwb8LJxyg8dN3CRNWf9Z2vRXNOkvnAd0hYnA6xsbSLDQ +V0wpJOTH1zyZejMMWLpZh5SKRxaJAtpsfZ32qppzJhn4jJb0v2fC+wJVkUy4mLe6yaHCrrHw +lwldyzlwPBNwFfk31mVFYO+COSTGq+RXU2kCdujfw648IBYltdWI3D1vTilJd0gt2EDmOqQi +zfFJLlBTdLieJdrXzL4WWuzvJpC1YadkmqMqnVkpcDxbxw0bK7G0faLigwWkshggaSns0vnp +D05jQyMJUYdLwB9lh6u0B9APcCxmPLhgHDdgdlZ+1JHMdfY0gIMSIAP2zkQu4iaTv5Tuc5a0 +3dXE7G6GwZ+A5YsrovQCot2FY653A0swmAsaCy3A2OcVFXXgmZGLYh/06XA/+WhMSLVIaQ6e +YTFgG9k8iopU6zw5p2vav1rOuirymLe3b/VNZhk6nOpewwLp+5c2Ylmj6zEHegFQ9pbmlFF/ +kubk9wGuS941G0/iLPyf3ePPhQ6hMY9L+7moW+Zlbqqg2XXa9S8C2rMwELDegpawYJyMIt25 +xAb94BGMkU/SxclzZ62ktGkYrA0ekiHkB6zzt8uhHrGDxWEucQARAQABtCFOaWtvbGF1cyBS +YXRoIDxOaWtvbGF1c0ByYXRoLm9yZz6IagQQEQoAKgUCUyJ7rCMaaHR0cDovL3d3dy5yYXRo +Lm9yZy9ncGdwb2xpY3kuaHRtbAAKCRCprbf4rk5CXNS7AJ9/Fdr8AzeAPKRoGN/ilFSb64kV +ggCeNE3F2CrZisHyjAlJ2sW/5iRS1MeJAUAEEAEKACoFAlMie5IjGmh0dHA6Ly93d3cucmF0 +aC5vcmcvZ3BncG9saWN5Lmh0bWwACgkQttywLM0aUrlgiQf/fskwiyKtKS2ikqsiw6rqo9RP +3A6AGJ3LQivpekV3elKxeu22L99yjkCEKHtggMmVd+Q9z9Pmvmx1d4EcVRtj7N86CcrQnPFb +vUaiZ22gCDS61BCbnItzeo3nkOhbJtCU2AXHwBCx2c1uGNzR5qJoymXo92FIp7JxKJ3hHZDW +E2XnX41bNwzZtycfZuk5VB29MIiEIIGbR/Y8rq7KwWQdyQ8y5i6Jnq5hPqRVpvMagcA9ycOI +Nkf6FqK0RHOjpxXgTHPjQudrlrhbbSOW5AQdsVGo+kJU/S+eYjPO1QLOAcVX1xDHmBIYUwY3 +wxIVUXUwiGScNuKHATAwm8SFZuzTqIkCHAQQAQgABgUCVNw4rgAKCRAekxDZrc5gZUqFD/44 +Ze4ow4ehRZ9P359WNwRKkOMmG/tMCq5boe6Sx+eon3dO8zlR6WZfRdlqbYWD4lUAN1H1zKbX +/EmBcHiT01d4MAk3E3JqsmVKnhoEAj1D9/UryQlsLPuGgtbocoCxo2yg3dgTsbUiuOhYeRtp ++zqdck55Y9awU1xi5MLHOryNyAtWqncxMSDF6e4R17+RNUZqDykJQhjTAm2V+OQiWZ3ro15T +0rYpy+2de5zCgZKKE3rZyaLYNjOaF3jRGvZfTRFyhsIyHxksoDfICUHayeTpHeLR6oczai14 +Eg6HG9TDDfNNEKOWNU6m1O9kSJ8Q+Ow+khVchSF6UY0gPl6o7SFukoybhm9A6WpRnGhgACUd +X84jzMNydrf7yp9AqUWohmOth2GSc+owDoQCjuIFEjLJr0Ic+YFP0WD8ZMIrXhtG+muv0mE4 +qqo0JJgC9rdZk9vt6SSzuA6Wg/Hb7lbkcNOwGysb2xnL5Czjqpl0LPfXGngYgQVLQ9Gf3x/E +v4BIgnmzTxfCkTjRw2omL4mtCQJsajGLmwPNjX0SBKw57h8L6olljgrzzKZf6hV2EGsTvfp9 +l1WJlLGD24WVUNnC0y4XlRO/zym1mCq8aLcnr+63BIsZZPvUToun7PvgIyxjtf3Y9FLKlh7I +xzZzcWZT+GJg0eLd2JMUrSE07jSn8Ot7N4kCHAQQAQgABgUCVN/l8gAKCRAWf9Q0wEOjE1iV +EADAQPNGvhvvVMONiYZ3hIfv2Te7yOIWduPtvzykXovK+pzwwFdGs0BqreVMo7dnONecj53s +vvRwHU1XD/oMDDYVXfy5mfmM4ffIID77tA37bVblMApkwFWm573oaTFJhHH6VkI9Kb1/ST4w +l9T8QdJrMkrdkr/2ypl6AHOFuI1A+VuAAKooZ34outAdzZgFBZEobBgHcZEwatarNLP+bl6b +1U8rYFUeKra9pFEcIIOEfa+OVumtPyh6bue2CBrhgCh1EhiF9sD8PxxGzx9ZH2wsgUfXwKVm +oE/bDsuWP7HJkpRFWRHeDgqohVCwUXqFaqwq4up6dWm0Js/wbZp87kzFaMjzTp98Nr3akNRO +636MXxNip6JHNNxGuI5TAbXGXG3Foh5b57bOfS3zc/g4328/6ehA+DDct+aBlrhEfSYGdZ3S +s28IRcsxY9Xpx1ouKXY3g51pJYzTTrLCQ28YVV3ImvzA6Pi6vaSrIoCtHfNqONloGo3QF/1z +leAGFGz0AmVCckTDk/QvxYG842LjMjtkXhsZpLUUmEE11ore6ZaFqDcWba/Ob81/Cp9yibp8 +WNyO2kj5vs6peStTp0mPoPbWmX+43QAYcoIeVcePgizDpk84+esn2XX/NbK0vE+eNXZF2oxU +sOBjoWbezD1X7+Ymz40Ry5H5OuaCwkkR0Id37IkCYQQTAQoASwUCUyJ5+iMaaHR0cDovL3d3 +dy5yYXRoLm9yZy9ncGdwb2xpY3kuaHRtbAIbAwUJEswDAAULCQgHAwUVCgkICwUWAgMBAAIe +AQIXgAAKCRDRE/ysPE5Zn+l4EADTvsHUBaIqTjakIkYy8P2mvgJ/YqeDi2bcdXFMdFxNkhTi +L/YlEoMelaUQoFUo0yKn6bMhYTtsCXohqKIb5hup1wDDjfhShxyWm9zPFrI/8O66tydnEgjr +0X45WWU6ull2YuWzabRCg/2NRSxnbYLglSnoAJCmjs1iVb35nOxj1xv3QJHsr6jETxGkLKoL +4eolcphRr0RycNr1gZT3xXtgLBNoePEpwS9RHHphHTbzXxQfQmIIHoI/FIwSSBYgzTPiRVsR +5nrCPhfhzvhGIiFwPimDfcrkMfnl9ge0QPLxD5tkect20MzIXgZu8t11URJEElS6tRikndfD +Cx/m8NkHTKkxg16ANeZxpJSi+zFTLMljqVHrA0bwwVI+VR2IcL/oPjQXIwj3HHj4q42YpE6q +B9vlFQeIM+W9ZIOqisOsCNpaijKs4BQkANREFwfaQBPcfTNoQV4oQO8OEJzhFTM2QUPFMZkg +8mD/FAIU03d3kfWZMqrMQUj4SdOrhEcsheX3coUji6b7brZIp2EF47CE8yCtPYs5U+sEaQFe +5ue/yh1k8MFrzhk+BDmelOaZBiyHAMeJzqx5pd2SisM5qrO2eo5aTPE7/lsEjzBlIy4dRfu1 +GYMU4VP3DzSHRZPXwa0TahZJY5orlfyyoip844p68djEBvO3sZOBQr7QRjAaIbkCDQRTInn6 +ARAAwL+oAUxGacCUctUxjdInq+HK/9EYV1KDOgsUV6JQfMF8nTJNXEYg8xsi7BXGtBf0JL0n +4TyVnVGBS2vaR3c4+xCvTTxEyOcgqyVeKp1Hh61wQYbnlbhANrT2dKItG/dwgZHVeDfW1ARr +gsBFF7L97OuHruipK8n9ibPruPS4szGMrBS6Fvdt1bPX258D1Y5Z2MrvQkjAOlynIKrgxMC1 +BiFNUH6ktukXmKgbpiPG8ZuZBk+60e2IkvXB5gp5dcNvJ0hd1xWpuMJeThUdwwQqA79Kf7LS +tmltqlbphGzbAMQy7DJBJpHMm55HwG6AUMDuDh9H1cLs891a5wyPgGzHFMlMUy3hJMI/LZO4 +L/oxRidFcRrPsIaXWP8Ot85no3+QguQNRiuNNDTLZv8L+ExNBDHfVbg9gdqZr0gfZQHBQIE2 +7XHfOvc7z7PMd2BtsGM/kKh3UTAZfgiZSgZSOZAOBRqb6dG2nTqxi+tTN0lhStQl9TpN39Nq +Ma9NJPjzzRU2dLdTRVX/S9R2hAWLG97sPUxBRSfCbEBeZsj8QwLhkkoypzaX39Hzq3jwm9ek +UAlJwNXwyEgLD+K2DctTyF6yeUfuKjXOu+YC86EvXvPcmu7+aVPLdHv3Flyao6b7xapZx5c0 +1FoK0bqPEHK4AopfyZ4kQyk/lxyMAbtdHFeYk30AEQEAAYkCSQQYAQoAMwUCUyJ5+iMaaHR0 +cDovL3d3dy5yYXRoLm9yZy9ncGdwb2xpY3kuaHRtbAIbDAUJEswDAAAKCRDRE/ysPE5ZnwbX +D/920l474IxY/HKcHNFwat42IMWHIAI61+CrL2ZKN7Ou13qBdMRMc9zUYrD4EifXen5WotTg +wEKKmCIDnCKcVxRpiGEocOXXW1dvUTEJA+2xJRfkEgv9jsO2Q9ftTtC1SD08/h3tiA5aF103 +ZkYnZdCCbz3WcgW01aOs1l/IxVtdT8+ZgtJUT43zOJWN5p6J8Egnb8vAD87UPNnVmyDfpW2t +GThfIrepWdve0hx1W1FrUsCVT5/suZvFMpAQaX4Tv50Sk3+g/77bwhe/OWJZyIJMsHCNlcJW ++QM3r28+mcNc5WiX1r2TdjGZBN3gWv23Vj8hhhS7w4jVWe/7pB/v67J2mZozVeUgfWR66HfX +mCS+W1OrIELKyZFDNgxxnct9vx6/wCHqX0RRqdTe7FJw0WKFvDUhuKU7B/CVSXooF39wgBx7 +iD7FVTtstPrzYte/VbPZz5nyHQppSFUHW6bFJG0NdqpfvQts7RDoWJwS4RPqXUTkCKOSQjVu +K+nl24M/awFwxdS0zDrHwd5zOsxhufqL4xRsrS5p5QfeUrcNOIYSEF75DLFxRfMHUP/icJcJ +s8LuTAFMtZqL7kbWok7wdRYmO8mez/FvNTRSo85TlUzR3Fc4xZndBJ3P9vDkvWpKPfuXpiBf +CuX9TFYSVolnnl2col5xay+f7P0XVpxLkO+fCw== +=gOOn +-----END PGP PUBLIC KEY BLOCK----- diff --git a/fuse.spec b/fuse.spec index 0f4d274..7a1c973 100644 --- a/fuse.spec +++ b/fuse.spec @@ -1,7 +1,7 @@ # # spec file for package fuse # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,35 +16,37 @@ # +%define tag 2_9_5 Name: fuse +Version: 2.9.5 +Release: 0 Summary: User space File System License: GPL-2.0+ and LGPL-2.1+ Group: System/Filesystems -Version: 2.9.4 -Release: 0 -# http://downloads.sf.net/fuse/fuse-%%version.tar.gz -Source: http://downloads.sourceforge.net/project/fuse/fuse-2.X/%{version}/%{name}-%{version}.tar.gz +Url: https://github.com/libfuse/libfuse +Source: https://github.com/libfuse/libfuse/releases/download/fuse_%{tag}/fuse-%{version}.tar.gz Source2: fuse.rpmlintrc Source3: baselibs.conf Source4: fuse.conf -Patch: fuse-install-fix.diff +Source5: https://github.com/libfuse/libfuse/releases/download/fuse_%{tag}/fuse-%{version}.tar.gz.asc +Patch0: fuse-install-fix.diff Patch3: fusermount-compile-as-pie.patch Patch4: aarch64-build-fix.patch -Url: http://fuse.sourceforge.net +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: pkgconfig +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: permissions BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 Requires: util-linux >= 2.18 %else Requires: util-linux(fake+no-canonicalize) %endif -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool -BuildRequires: pkgconfig %if 0%{?suse_version} >= 1000 Supplements: filesystem(fuse) %endif -PreReq: permissions %description With FUSE, a user space program can export a file system through the @@ -138,12 +140,12 @@ http://fuse.sourceforge.net/wiki %prep %setup -q -%patch -p1 +%patch0 -p1 %patch3 -p1 %patch4 %build -export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing" +export CFLAGS="%{optflags} -g -fno-strict-aliasing" export MOUNT_FUSE_PATH=%{_sbindir} autoreconf -fi %configure --with-pic \ @@ -154,30 +156,30 @@ autoreconf -fi make %{?_smp_mflags} %install -%makeinstall -rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d -install -m644 -D %{S:4} $RPM_BUILD_ROOT/%{_sysconfdir}/fuse.conf +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm -rf %{buildroot}/%{_sysconfdir}/init.d +install -m644 -D %{SOURCE4} %{buildroot}/%{_sysconfdir}/fuse.conf # Needed for OpenSUSE buildservice -%if %suse_version <= 1020 -install -m644 -D util/udev.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/99-fuse.rules +%if 0%{?suse_version} <= 1020 +install -m644 -D util/udev.rules %{buildroot}/%{_sysconfdir}/udev/rules.d/99-fuse.rules %endif -%{__rm} -f %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print # not needed for fuse, might reappar in separate package: -%{__rm} -f %{buildroot}/%{_libdir}/libulockmgr.a +rm -f %{buildroot}/%{_libdir}/libulockmgr.a #UsrMerge -mkdir $RPM_BUILD_ROOT/sbin -mkdir $RPM_BUILD_ROOT/%{_lib} -%{__ln_s} -v %{_sbindir}/mount.fuse $RPM_BUILD_ROOT/sbin -pushd $RPM_BUILD_ROOT/%{_libdir} +mkdir %{buildroot}/sbin +mkdir %{buildroot}/%{_lib} +ln -s -v %{_sbindir}/mount.fuse %{buildroot}/sbin +pushd %{buildroot}/%{_libdir} for libname in $(ls *.so.*);do -%{__ln_s} -v /%{_libdir}/$libname %{buildroot}/%{_lib} +ln -s -v /%{_libdir}/$libname %{buildroot}/%{_lib} done popd #EndUsrMerge -(cd example && %{__make} clean) -%{__rm} -rf example/.deps example/Makefile.am example/Makefile.in -%{__rm} -rf doc/Makefile.am doc/Makefile.in doc/Makefile +(cd example && make clean) +rm -rf example/.deps example/Makefile.am example/Makefile.in +rm -rf doc/Makefile.am doc/Makefile.in doc/Makefile %post %if 0%{?suse_version} >= 1140 @@ -185,6 +187,7 @@ popd %else %run_permissions %endif + %verifyscript %verify_permissions -e %{_bindir}/fusermount @@ -198,8 +201,8 @@ popd %files %defattr(-,root,root) -%doc AUTHORS ChangeLog FAQ NEWS README* COPYING* -%if %suse_version <= 1020 +%doc AUTHORS ChangeLog NEWS README* COPYING* +%if 0%{?suse_version} <= 1020 %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %{_sysconfdir}/udev/rules.d/99-fuse.rules