pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/detox detox: update to 1.4.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/c22bf5c40605
branches: trunk
changeset: 448209:c22bf5c40605
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Mar 06 08:07:10 2021 +0000
description:
detox: update to 1.4.1.
Update HOMEPAGE, from author in PR 56041.
1.4.1
Fixed a memory overflow bug while reading files from the command line, using
a patch from David Tardon, which was passed on by UsernameRandomlyGenerated.
[#56] #sf-patch-3
1.4.0
Added
Regression tests for basic functionality, based on old custom scripts.
Regression tests confirming fixes for previously fixed issues: #14, #19.
Changed
Removed one check for . and .. when traversing a directory tree. #12
Regenerated config file parser.
Updated the safe filter to translate new lines, carriage returns, and tabs
into underscores. #9 #11 #17
Fixed
The examples in detox.1 no longer say -c when they mean -f. #30
The command synopsis in detox.1 and inline-detox.1 no longer adds a dash
before the sequence and configfile. #30
1.3.3
Fix version identifier in detox binary.
1.3.2
Fixed
Table based UTF-8 translation no longer mangles characters. [#14]
1.3.1
Fixed
Merged fix for Debian #861537, written by Vasily Kolobkov, passed on by
Zenaan Harkness, Quentin Guittard, and Joao Eriberto Mota Filho. This
addresses an issue with detox generating malformed characters during
translation. #14
1.3.0
Migrated from configure.in and Makefile.in to the full autoconf suite. [#1]
Remove detox_path.h, in favor of command line defines. [#1]
Removed libpopt support. [#2]
Fixed the way inline-detox is generated. [#6]
Merged parse_option_*.[ch] and file*.[ch]. [#1, #2, #6]
Added --inline as an option to detox, to enable inline mode on the main
binary. [#6]
diffstat:
sysutils/detox/Makefile | 19 +++++++++----------
sysutils/detox/PLIST | 9 ++++++++-
sysutils/detox/distinfo | 12 ++++++------
sysutils/detox/patches/patch-Makefile.in | 21 +++++++++++++++++++++
sysutils/detox/patches/patch-aa | 27 ---------------------------
5 files changed, 44 insertions(+), 44 deletions(-)
diffs (131 lines):
diff -r b2b4c543c2a5 -r c22bf5c40605 sysutils/detox/Makefile
--- a/sysutils/detox/Makefile Sat Mar 06 05:13:16 2021 +0000
+++ b/sysutils/detox/Makefile Sat Mar 06 08:07:10 2021 +0000
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.11 2020/03/20 11:58:20 nia Exp $
-#
+# $NetBSD: Makefile,v 1.12 2021/03/06 08:07:10 wiz Exp $
-DISTNAME= detox-1.2.0
+DISTNAME= detox-1.4.1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=detox/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=dharple/}
+GITHUB_RELEASE= v${PKGVERSION_NOREV}
MAINTAINER= bartosz.kuzma%gmail.com@localhost
-HOMEPAGE= http://detox.sourceforge.net/
+HOMEPAGE= https://github.com/dharple/detox
COMMENT= Removes non-standard characters from filenames
+LICENSE= modified-bsd
GNU_CONFIGURE= yes
-USE_TOOLS+= lex:run gmake
-INSTALL_TARGET= install-base install-unsafe-config
+USE_TOOLS+= lex:run
EGDIR= ${PREFIX}/share/examples/detox
+INSTALLATION_DIRS+= share/examples/detox
CONF_FILES= ${EGDIR}/detoxrc ${PKG_SYSCONFDIR}/detoxrc
post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/detoxrc ${DESTDIR}${EGDIR}/detoxrc
+ mv ${DESTDIR}${PREFIX}/etc/detoxrc* ${DESTDIR}${PREFIX}/share/examples/detox
.include "../../mk/bsd.pkg.mk"
diff -r b2b4c543c2a5 -r c22bf5c40605 sysutils/detox/PLIST
--- a/sysutils/detox/PLIST Sat Mar 06 05:13:16 2021 +0000
+++ b/sysutils/detox/PLIST Sat Mar 06 08:07:10 2021 +0000
@@ -1,9 +1,16 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:16:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/03/06 08:07:10 wiz Exp $
bin/detox
bin/inline-detox
man/man1/detox.1
+man/man1/inline-detox.1
man/man5/detox.tbl.5
man/man5/detoxrc.5
share/detox/iso8859_1.tbl
+share/detox/iso8859_1.tbl.sample
+share/detox/safe.tbl
+share/detox/safe.tbl.sample
share/detox/unicode.tbl
+share/detox/unicode.tbl.sample
+share/doc/detox/README.md
share/examples/detox/detoxrc
+share/examples/detox/detoxrc.sample
diff -r b2b4c543c2a5 -r c22bf5c40605 sysutils/detox/distinfo
--- a/sysutils/detox/distinfo Sat Mar 06 05:13:16 2021 +0000
+++ b/sysutils/detox/distinfo Sat Mar 06 08:07:10 2021 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2019/09/18 12:16:22 maya Exp $
+$NetBSD: distinfo,v 1.5 2021/03/06 08:07:10 wiz Exp $
-SHA1 (detox-1.2.0.tar.bz2) = cfb88a1adefaf4ee3933baf9a6530c102baa47ce
-RMD160 (detox-1.2.0.tar.bz2) = 02eb1a5ebc28f6f6e024d58b998758d156002a70
-SHA512 (detox-1.2.0.tar.bz2) = 48c0060ed0538c26aeba444bf327f1e52ea47d0e696577deeb43304dfb960ee5abe984651948bfc67c51d7f15f9051df2a208acfe53a5778a7471460e87f639a
-Size (detox-1.2.0.tar.bz2) = 86118 bytes
-SHA1 (patch-aa) = b1a3855a2cbf9d1d3325f22c00bdccd772ad768a
+SHA1 (detox-1.4.1.tar.gz) = ae027ff07ead367611b9dad22b5f2924e2f665a2
+RMD160 (detox-1.4.1.tar.gz) = a5ac0d281676b23666faacb33fc895275f674c57
+SHA512 (detox-1.4.1.tar.gz) = d9121ecfa4d50bbc0a880a551239c8e0578c9039234a5f0c230d81feb9ee2452b2dc6239a5b055df24053838574bf92f3780b98134c230c147442dedd467ea9c
+Size (detox-1.4.1.tar.gz) = 142503 bytes
+SHA1 (patch-Makefile.in) = 30967611a73577c6586480e474d332268e349ce9
diff -r b2b4c543c2a5 -r c22bf5c40605 sysutils/detox/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/detox/patches/patch-Makefile.in Sat Mar 06 08:07:10 2021 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/03/06 08:07:10 wiz Exp $
+
+NetBSD's cp does not support '-n'.
+
+--- Makefile.in.orig 2021-02-24 14:33:19.000000000 +0000
++++ Makefile.in
+@@ -950,10 +950,10 @@ uninstall-man: uninstall-man1 uninstall-
+
+
+ install-data-hook:
+- cp -an $(DESTDIR)$(sysconfdir)/detoxrc.sample $(DESTDIR)$(sysconfdir)/detoxrc && \
+- cp -an $(DESTDIR)$(pkgdatadir)/iso8859_1.tbl.sample $(DESTDIR)$(pkgdatadir)/iso8859_1.tbl && \
+- cp -an $(DESTDIR)$(pkgdatadir)/safe.tbl.sample $(DESTDIR)$(pkgdatadir)/safe.tbl && \
+- cp -an $(DESTDIR)$(pkgdatadir)/unicode.tbl.sample $(DESTDIR)$(pkgdatadir)/unicode.tbl
++ cp -a $(DESTDIR)$(sysconfdir)/detoxrc.sample $(DESTDIR)$(sysconfdir)/detoxrc && \
++ cp -a $(DESTDIR)$(pkgdatadir)/iso8859_1.tbl.sample $(DESTDIR)$(pkgdatadir)/iso8859_1.tbl && \
++ cp -a $(DESTDIR)$(pkgdatadir)/safe.tbl.sample $(DESTDIR)$(pkgdatadir)/safe.tbl && \
++ cp -a $(DESTDIR)$(pkgdatadir)/unicode.tbl.sample $(DESTDIR)$(pkgdatadir)/unicode.tbl
+
+ .PHONY: force-install
+ force-install: install
diff -r b2b4c543c2a5 -r c22bf5c40605 sysutils/detox/patches/patch-aa
--- a/sysutils/detox/patches/patch-aa Sat Mar 06 05:13:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2019/09/18 12:16:22 maya Exp $
-
-Find where -lfl might be,
-
-don't install directly to sysconfdir (we install to the
-share/examples in the package Makefile)
-
---- Makefile.in.orig 2008-04-12 01:02:47.000000000 +0000
-+++ Makefile.in
-@@ -40,7 +40,7 @@ sysconfdir = @sysconfdir@
- datadir = @datadir@
-
- CFLAGS = @CFLAGS@
--L_OPT = @LEXLIB@ @LIBS@
-+L_OPT = @LEXLIB@ @LIBS@ @LDFLAGS@
-
- CC = @CC@
- LEX = @LEX@
-@@ -149,7 +149,7 @@ install-safe-config:
- fi
-
- install-unsafe-config:
-- ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
-+# ${INSTALL} -m 644 detoxrc ${DESTDIR}${sysconfdir}
- ${INSTALL} -m 644 iso8859_1.tbl ${DESTDIR}${datadir}/detox
- ${INSTALL} -m 644 unicode.tbl ${DESTDIR}${datadir}/detox
-
Home |
Main Index |
Thread Index |
Old Index