From b2f0dc97c001dd9fff5373f3623da7bdc5bba418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrkan=20Myczko?= Date: Mon, 22 Jan 2024 13:28:16 +0100 Subject: [PATCH] my take on unadf to adflib in debian --- debian/README.Debian | 7 ---- debian/README.source | 12 ------- debian/changelog | 67 ++++++++++++++++++++++++++++++++++-- debian/compat | 1 - debian/control | 19 +++++----- debian/copyright | 3 +- debian/libadf-dev.docs | 13 +++---- debian/libadf-dev.install | 3 +- debian/libadf-utils.install | 9 ++--- debian/libadf-utils.manpages | 12 ++++--- debian/libadf.install | 2 +- debian/rules | 4 --- 12 files changed, 98 insertions(+), 54 deletions(-) delete mode 100644 debian/README.Debian delete mode 100644 debian/README.source delete mode 100644 debian/compat diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index a1864021..00000000 --- a/debian/README.Debian +++ /dev/null @@ -1,7 +0,0 @@ -ADFlib for Debian -------------------- - -Initial version for Debian - possibly to improve. -Please report any issues. - - -- Tomasz Wolak Thu, 10 Nov 2022 22:00:20 +0100 diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 431594b1..00000000 --- a/debian/README.source +++ /dev/null @@ -1,12 +0,0 @@ -ADFlib for Debian -------------------- - -The source package is being created from the same directory, excluding -files for Debian (like debian/ directory). - -TODO: -- make the files/scripts generic, add patches for Debian - - - -- Tomasz Wolak Thu, 10 Nov 2022 22:01:30 +0100 - diff --git a/debian/changelog b/debian/changelog index c2b0778e..399c6365 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,66 @@ -libadf (0.8.0-1) unstable; urgency=medium +unadf (0.8.0+ds-1) unstable; urgency=medium - * Initial packaging of version 0.8.0 for Debian. + * New maintainer. (Closes: 661461) + * New upstream version. - -- Tomasz Wolak Mon, 26 Jun 2023 20:01:05 +0100 + -- Tomasz Wolak Mon, 22 Jan 2024 13:05:55 +0100 + +unadf (0.7.11a-4) unstable; urgency=high + + * Orphan package with security issues. + * Tuomas Räsänene discoveried two security issues (Closes: #838248): + - CVE-2016-1243: stack buffer overflow caused by blindly trusting on + pathname lengths of archived files. + - CVE-2016-1244: execution of unsanitized input. + * Standards-Version: 3.9.8 + + -- Luciano Bello Sat, 24 Sep 2016 11:43:06 -0400 + +unadf (0.7.11a-3) unstable; urgency=low + + * QA upload. + * Updated debian/rules: + - now dh is used instead of direct dh_* commands + - fixed FTBFS because of invalid clean section (Closes: #676065) + * Updated debian/unadf.1: fixed lintian note hyphen-used-as-minus-sign. + * Added file debian/patches/add-hardening-flags-in-compiler-options. + * Added debian/unadf.doc-base: + fixed lintian note possible-documentation-but-no-doc-base-registration. + * Updated debian/control: + ixed lintian note extended-description-is-probably-too-short. + * Updated debian/copyright: + file was updated in according to Copyright format 1.0. + * Deleted debian/source/options. + * Added debian/watch. + + -- Boris Pek Tue, 19 Jun 2012 23:26:34 +0300 + +unadf (0.7.11a-2) unstable; urgency=low + + [ Axel Beckert ] + * QA Upload of orphaned package (cf. #661461) + * Set QA Group as Maintainer. (Closes: #675221) + * Add patch to make it work on 64 bit architectures (Closes: #458129) + * Add Homepage field + * Ignore .depend files modified by built system + * Fix lintian warnings: + + copyright-refers-to-symlink-license + + copyright-with-old-dh-make-debian-copyright + * Reword long description + + [ Gürkan Sengün ] + * Added debian/source/format, switch to format 3.0 (quilt) + * Bump standards version to 3.9.3. + * Bump debhelper version to 8. + * debian/rules: updated. + + -- Axel Beckert Sun, 03 Jun 2012 04:49:22 +0200 + +unadf (0.7.11a-1) unstable; urgency=low + + * Initial release. (Closes: #148007) + - Added Win32/ to includes of defendian.h. + - Removed double */ comment typo. + * Rebuilt the tarball (zip file unpacks to ./) + + -- Gürkan Sengün Sun, 7 Jan 2007 15:02:25 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 06eda0c0..2031cd9f 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,15 @@ -Source: libadf +Source: unadf Section: libs Priority: optional Maintainer: Tomasz Wolak +Uploaders: Gürkan Myczko Build-Depends: dh-autoreconf, - debhelper (>= 9), + debhelper-compat (= 13), autotools-dev -Standards-Version: 4.3.0 -Homepage: https://gitlab.com/lclevy/ADFlib -Vcs-Git: https://gitlab.com/lclevy/ADFlib -Vcs-Browser: https://gitlab.com/lclevy/ADFlib/tree/master +Standards-Version: 4.6.2 +Homepage: https://github.com/lclevy/ADFlib +Vcs-Git: https://salsa.debian.org/debian/unadf.git +Vcs-Browser: https://salsa.debian.org/debian/unadf Package: libadf Architecture: any @@ -16,9 +17,8 @@ Multi-Arch: same Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: ADFlib - shared library. - ADFlib is a a free, portable and open implementation of the Amiga filesystem. + This is a a free, portable and open implementation of the Amiga filesystem. . This package contains the shared library. @@ -31,7 +31,7 @@ Depends: libadf (= ${binary:Version}), ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Description: ADFlib - development files - ADFlib is a a free, portable and open implementation of the Amiga filesystem. + This is a a free, portable and open implementation of the Amiga filesystem. . This package contains the development files. @@ -42,7 +42,6 @@ Section: utils Depends: libadf (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} Description: Utilities for Amiga disk image files (ADF). Utilities for ADF disk images: . diff --git a/debian/copyright b/debian/copyright index e100c74f..d6858857 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: libadf +Upstream-Name: ADFlib +Upstream-Contact: Laurent Clévy Source: https://github.com/lclevy/ADFlib Files: * diff --git a/debian/libadf-dev.docs b/debian/libadf-dev.docs index f71a523d..c217b955 100644 --- a/debian/libadf-dev.docs +++ b/debian/libadf-dev.docs @@ -1,6 +1,7 @@ -AUTHORS -ChangeLog -README.md -doc/*.html -doc/*.txt -doc/FAQ/* +#AUTHORS +#ChangeLog +#README.md +#doc/*.html +#doc/*.txt +#doc/FAQ/* +usr/share/doc/adflib/* diff --git a/debian/libadf-dev.install b/debian/libadf-dev.install index ad3bae42..73b3a8ed 100644 --- a/debian/libadf-dev.install +++ b/debian/libadf-dev.install @@ -1,5 +1,6 @@ #usr/lib/*/*.so.* -src/*.h usr/include/adf +#src/*.h usr/include/adf +usr/include/adf/*.h usr/lib/*/lib*.a usr/lib/*/lib*.la usr/lib/*/lib*.so diff --git a/debian/libadf-utils.install b/debian/libadf-utils.install index 66dd8f5e..9714c5a7 100644 --- a/debian/libadf-utils.install +++ b/debian/libadf-utils.install @@ -1,4 +1,5 @@ -examples/.libs/adf_floppy_create /usr/bin -examples/.libs/adf_floppy_format /usr/bin -examples/.libs/adf_show_metadata /usr/bin -examples/.libs/unadf /usr/bin +usr/bin/* +#examples/.libs/adf_floppy_create /usr/bin +#examples/.libs/adf_floppy_format /usr/bin +#examples/.libs/adf_show_metadata /usr/bin +#examples/.libs/unadf /usr/bin diff --git a/debian/libadf-utils.manpages b/debian/libadf-utils.manpages index f5716307..dcf881cf 100644 --- a/debian/libadf-utils.manpages +++ b/debian/libadf-utils.manpages @@ -1,4 +1,8 @@ -doc/adf_floppy_create.1 -doc/adf_floppy_format.1 -doc/adf_show_metadata.1 -doc/unadf.1 +#doc/adf_floppy_create.1 +#doc/adf_floppy_format.1 +#doc/adf_show_metadata.1 +#doc/unadf.1 +usr/share/man/man1/adf_floppy_create.1 +usr/share/man/man1/adf_floppy_format.1 +usr/share/man/man1/adf_show_metadata.1 +usr/share/man/man1/unadf.1 diff --git a/debian/libadf.install b/debian/libadf.install index d9b53937..c3236a09 100644 --- a/debian/libadf.install +++ b/debian/libadf.install @@ -1 +1 @@ -debian/tmp/usr/lib/*/libadf*.so.* +usr/lib/*/libadf*.so.* diff --git a/debian/rules b/debian/rules index 284364b6..87f08cd0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,6 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. export DH_VERBOSE = 1 - # see FEATURE AREAS in dpkg-buildflags(1) #export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -13,7 +10,6 @@ export DH_VERBOSE = 1 # package maintainers to append LDFLAGS #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - %: # dh $@ --parallel # dh $@ --parallel --with autotools_dev