Accepting request 1222503 from filesystems

- Update to 1.3.1 (forwarded request 1222502 from dsterba)

OBS-URL: https://build.opensuse.org/request/show/1222503
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/linux-ftools?expand=0&rev=5

COPYING

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

gcc46.diff

@@ -1,19 +0,0 @@
---- linux-fincore.c
-+++ flinux-incore.c
-@@ -13,6 +13,7 @@
- #include <errno.h>
- #include <locale.h>
- #include <sys/ioctl.h> 
-+#include <string.h>
- 
- char STR_FORMAT[] =  "%-80s %18s %18s %18s %18s %18s %18s\n";
- char DATA_FORMAT[] = "%-80s %'18ld %'18d %'18ld %'18ld %'18ld %18.2f\n";
-@@ -585,6 +586,8 @@
-         //TODO: add more metrics including total size... 
-         printf( "total cached size: %'ld\n", total_cached_size );
- 
-+ 
-     }
- 
-+    return 0;
- }

linux-ftools-1.3.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a6ed04655c54bcd8c8402324441f74b67055a54de46c39c18d06cd2436abbc3
+size 135525

linux-ftools-2a7918d4b81b.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b7ee1ad7d71abe294a77c1b0db51c2dca9e5596a73a8f868f5a500341f0d7a2
-size 79370

linux-ftools.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov  7 00:00:00 CET 2024 - dsterba@suse.cz
+
+- Update to 1.3.1
+  - build fixes
+- Removed patches: gcc46.diff, linux-ftools_use_asm_unistd_h.patch
+
 -------------------------------------------------------------------
 Fri Mar  1 10:47:46 UTC 2024 - pgajdos@suse.com
 

linux-ftools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package linux-ftools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,22 +12,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define hg_version 2a7918d4b81b
 Name:           linux-ftools
-Version:        1.3
+Version:        1.3.1
 Release:        0
 Summary:        Linux command line tools for fallocate, fincore, fadvise, etc
 License:        Apache-2.0
 Group:          Development/Debug
-Url:            http://code.google.com/p/linux-ftools/
+URL:            http://code.google.com/p/linux-ftools/
-Source:         linux-ftools-%{hg_version}.tar.gz
+Source:         linux-ftools-%{version}.tar.gz
-Source1:        COPYING
-Patch0:         gcc46.diff
-Patch1:         linux-ftools_use_asm_unistd_h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -43,24 +39,26 @@ determine information about the running kernel, improve system performance, and
 debug performance problems.
 
 %prep
-%setup -q -n linux-ftools-%{hg_version}
+%setup -q -n linux-ftools-%{version}
-%patch -P 0
-%patch -P 1 -p1
 
 %build
 autoreconf -fi
 %configure
 make %{?_smp_mflags}
-cp %{S:1} .
 
 %install
 make install DESTDIR=%{buildroot}
-# already shipped by util-linux
+install -D -m 0755 fallocate %{buildroot}%{_bindir}/linux-fallocate
-rm -f %{buildroot}%{_bindir}/linux-fallocate
+install -D -m 0755 fadvise %{buildroot}%{_bindir}/linux-fadvise
+install -D -m 0755 fincore %{buildroot}%{_bindir}/linux-fincore
+rm %{buildroot}%{_bindir}/fallocate
+rm %{buildroot}%{_bindir}/fadvise
+rm %{buildroot}%{_bindir}/fincore
 
 %files
 %defattr(-,root,root)
-%doc COPYING README
+%doc COPYING README.md
+%{_bindir}/linux-fallocate
 %{_bindir}/linux-fadvise
 %{_bindir}/linux-fincore
 

linux-ftools_use_asm_unistd_h.patch

@@ -1,42 +0,0 @@
-From:  david.t....@gmail.com
-Subject: linux ftools use asm unistd h
-
-unistd_64.h is debian specific.
-unistd.h has a ifdef that selects the right distribution
-
-This is based on patch from david.t....@gmail.com found at
-https://code.google.com/p/linux-ftools/issues/detail?id=5
-
-Signed-off-by: david.t....@gmail.com
-Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
----
- linux-fadvise.c   |    2 +-
- linux-fallocate.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: linux-ftools-2a7918d4b81b/linux-fadvise.c
-===================================================================
---- linux-ftools-2a7918d4b81b.orig/linux-fadvise.c
-+++ linux-ftools-2a7918d4b81b/linux-fadvise.c
-@@ -5,7 +5,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <sys/syscall.h>
--#include <asm/unistd_64.h>
-+#include <asm/unistd.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdlib.h>
-Index: linux-ftools-2a7918d4b81b/linux-fallocate.c
-===================================================================
---- linux-ftools-2a7918d4b81b.orig/linux-fallocate.c
-+++ linux-ftools-2a7918d4b81b/linux-fallocate.c
-@@ -4,7 +4,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <sys/syscall.h>
--#include <asm/unistd_64.h>
-+#include <asm/unistd.h>
- #include <errno.h>
- #include <fcntl.h>
- #include <stdlib.h>