diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/byacc.spec | 50 | ||||
-rw-r--r-- | package/debian/byacc.docs | 4 | ||||
-rw-r--r-- | package/debian/byacc.postinst (renamed from package/debian/postinst) | 4 | ||||
-rw-r--r-- | package/debian/byacc.prerm (renamed from package/debian/prerm) | 1 | ||||
-rw-r--r-- | package/debian/byacc2.docs (renamed from package/debian/docs) | 0 | ||||
-rw-r--r-- | package/debian/byacc2.postinst | 15 | ||||
-rw-r--r-- | package/debian/byacc2.prerm | 12 | ||||
-rw-r--r-- | package/debian/changelog | 13 | ||||
-rw-r--r-- | package/debian/compat | 1 | ||||
-rw-r--r-- | package/debian/control | 16 | ||||
-rw-r--r-- | package/debian/copyright | 109 | ||||
-rwxr-xr-x | package/debian/rules | 10 | ||||
-rw-r--r-- | package/debian/watch | 25 | ||||
-rw-r--r-- | package/mingw-byacc.spec | 45 | ||||
-rw-r--r-- | package/pkgsrc/Makefile | 2 |
15 files changed, 196 insertions, 111 deletions
diff --git a/package/byacc.spec b/package/byacc.spec index 9cff7ab..2207f93 100644 --- a/package/byacc.spec +++ b/package/byacc.spec @@ -1,17 +1,18 @@ -Summary: byacc - public domain Berkeley LALR Yacc parser generator -%define AppProgram byacc -%define AltProgram byacc2 -%define AppVersion 20220101 -%define UseProgram yacc -# $Id: byacc.spec,v 1.62 2022/01/01 14:59:55 tom Exp $ -Name: %{AppProgram} -Version: %{AppVersion} +Summary: public domain Berkeley LALR Yacc parser generator + +%global AppVersion 2.0 +%global AppPatched 20220109 + +%global AltProgram byacc2 +%global UseProgram yacc + +# $Id: byacc.spec,v 1.65 2022/01/09 20:03:07 tom Exp $ +Name: byacc +Version: %{AppVersion}.%{AppPatched} Release: 1 License: Public Domain, MIT -Group: Applications/Development -URL: ftp://invisible-island.net/%{AppProgram} -Source0: %{AppProgram}-%{AppVersion}.tgz -Packager: Thomas E. Dickey <dickey@invisible-island.net> +URL: https://invisible-island.net/%{name}/ +Source0: https://invisible-mirror.net/archives/%{name}/%{name}-%{AppPatched}.tgz %description This package provides a parser generator utility that reads a grammar @@ -21,7 +22,7 @@ routine written in the C programming language. It has a public domain license which includes the generated C. %package -n byacc2 -Summary: Curses library with POSIX thread support. +Summary: public domain Berkeley LALR Yacc parser generator with backtracking %description -n byacc2 This package provides a parser generator utility that reads a grammar @@ -34,9 +35,9 @@ This package has the backtracking extension. %prep -%define debug_package %{nil} +%global debug_package %{nil} -%setup -q -n %{AppProgram}-%{AppVersion} +%setup -q -n %{name}-%{AppPatched} %build %define my_srcdir .. @@ -76,7 +77,7 @@ popd pushd BUILD-byacc make install DESTDIR=$RPM_BUILD_ROOT -( cd $RPM_BUILD_ROOT%{_bindir} && ln -vs %{AppProgram} %{UseProgram} ) +( cd $RPM_BUILD_ROOT%{_bindir} && ln -vs %{name} %{UseProgram} ) popd pushd BUILD-byacc2 @@ -87,19 +88,24 @@ popd [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%{_prefix}/bin/%{AppProgram} -%{_prefix}/bin/%{UseProgram} -%{_mandir}/man1/%{AppProgram}.* +%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README +%license LICENSE +%{_bindir}/%{name} +%{_bindir}/%{UseProgram} +%{_mandir}/man1/%{name}.* %files -n byacc2 -%defattr(-,root,root) -%{_prefix}/bin/%{AltProgram} +%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README README.BTYACC +%license LICENSE +%{_bindir}/%{AltProgram} %{_mandir}/man1/%{AltProgram}.* %changelog # each patch should add its ChangeLog entries here +* Sun Jan 09 2022 Thomas Dickey +- rpmlint + * Sat Jan 01 2022 Thomas Dickey - rename btyacc package to byacc2 to co-exist with traditional btyacc diff --git a/package/debian/byacc.docs b/package/debian/byacc.docs new file mode 100644 index 0000000..cbda209 --- /dev/null +++ b/package/debian/byacc.docs @@ -0,0 +1,4 @@ +README +ACKNOWLEDGEMENTS +NEW_FEATURES +NOTES diff --git a/package/debian/postinst b/package/debian/byacc.postinst index 28bcd08..ca6276d 100644 --- a/package/debian/postinst +++ b/package/debian/byacc.postinst @@ -8,10 +8,6 @@ if [ $1 != "upgrade" ] ; then --install /usr/bin/yacc yacc /usr/bin/byacc 80 \ --slave /usr/share/man/man1/yacc.1.gz yaccman \ /usr/share/man/man1/byacc.1.gz - update-alternatives \ - --install /usr/bin/yacc yacc /usr/bin/byacc2 80 \ - --slave /usr/share/man/man1/yacc.1.gz yaccman \ - /usr/share/man/man1/byacc2.1.gz fi #DEBHELPER# diff --git a/package/debian/prerm b/package/debian/byacc.prerm index d300dcf..f3889d7 100644 --- a/package/debian/prerm +++ b/package/debian/byacc.prerm @@ -5,7 +5,6 @@ set -e if [ $1 != "upgrade" ]; then update-alternatives --remove yacc /usr/bin/byacc - update-alternatives --remove yacc /usr/bin/byacc2 fi #DEBHELPER# diff --git a/package/debian/docs b/package/debian/byacc2.docs index 1985e68..1985e68 100644 --- a/package/debian/docs +++ b/package/debian/byacc2.docs diff --git a/package/debian/byacc2.postinst b/package/debian/byacc2.postinst new file mode 100644 index 0000000..1a4d7e1 --- /dev/null +++ b/package/debian/byacc2.postinst @@ -0,0 +1,15 @@ +#! /bin/sh +# postinst script for byacc2 + +set -e + +if [ $1 != "upgrade" ] ; then + update-alternatives \ + --install /usr/bin/yacc yacc /usr/bin/byacc2 80 \ + --slave /usr/share/man/man1/yacc.1.gz yaccman \ + /usr/share/man/man1/byacc2.1.gz +fi + +#DEBHELPER# + +exit 0 diff --git a/package/debian/byacc2.prerm b/package/debian/byacc2.prerm new file mode 100644 index 0000000..eb86dfc --- /dev/null +++ b/package/debian/byacc2.prerm @@ -0,0 +1,12 @@ +#! /bin/sh +# prerm script for byacc2 + +set -e + +if [ $1 != "upgrade" ]; then + update-alternatives --remove yacc /usr/bin/byacc2 +fi + +#DEBHELPER# + +exit 0 diff --git a/package/debian/changelog b/package/debian/changelog index bf3dee9..76eb417 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,3 +1,16 @@ +byacc (1:2.0.20220109) unstable; urgency=low + + * maintenance updates, modify packaging to more closely match distributors. + In particular, correct versioning using an epoch. + + -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 09 Jan 2022 10:49:20 -0500 + +byacc (20220102) unstable; urgency=low + + * maintenance updates + + -- Thomas E. Dickey <dickey@invisible-island.net> Sun, 02 Jan 2022 11:12:56 -0500 + byacc (20220101) unstable; urgency=low * maintenance updates diff --git a/package/debian/compat b/package/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/package/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/package/debian/control b/package/debian/control index 46beb2f..40437f6 100644 --- a/package/debian/control +++ b/package/debian/control @@ -1,11 +1,13 @@ Source: byacc Maintainer: Thomas E. Dickey <dickey@invisible-island.net> +Uploaders: Thomas E. Dickey <dickey@his.com> Section: devel Priority: optional -Standards-Version: 4.3.0 -Build-Depends: debhelper (>= 11) +Standards-Version: 4.6.0.1 +Build-Depends: debhelper-compat (= 12), Homepage: https://invisible-island.net/byacc/ -Vcs-Git: https://salsa.debian.org/dickey/byacc +Vcs-Browser: https://salsa.debian.org/debian/byacc +Vcs-Git: https://salsa.debian.org/debian/byacc.git Package: byacc Provides: yacc @@ -18,17 +20,21 @@ Description: public domain Berkeley LALR Yacc parser generator parsers consist of a set of LALR(1) parsing tables and a driver routine written in the C programming language. It has a public domain license which includes the generated C. + . + Related packages: bison, btyacc, byacc2, antlr Package: byacc2 Provides: yacc Architecture: any Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} -Description: public domain Berkeley LALR Yacc parser generator +Description: public domain Berkeley LALR Yacc parser generator, with back-tracking This package provides a parser generator utility that reads a grammar specification from a file and generates an LR(1) parser for it. The parsers consist of a set of LALR(1) parsing tables and a driver routine written in the C programming language. It has a public domain license which includes the generated C. . - This package has the backtracking extension. + This package has the backtracking extension, adapted from btyacc. + . + Related packages: bison, btyacc, byacc, antlr diff --git a/package/debian/copyright b/package/debian/copyright index dbbb151..7cc1263 100644 --- a/package/debian/copyright +++ b/package/debian/copyright @@ -1,42 +1,48 @@ -Upstream source https://invisible-island.net/byacc/byacc.html - -Berkeley Yacc is in the public domain; changes made to it by the current -maintainer are likewise unrestricted. That applies to most of the files. -A few files (currently those related to autoconf scripting) have other -licenses as noted here. - -Current byacc upstream maintainer: Thomas Dickey <dickey@invisible-island.net> - -Public domain notice and no warranty: -------------------------------------------------------------------------------- - Berkeley Yacc is an LALR(1) parser generator. Berkeley Yacc has been made -as compatible as possible with AT&T Yacc. Berkeley Yacc can accept any input -specification that conforms to the AT&T Yacc documentation. Specifications -that take advantage of undocumented features of AT&T Yacc will probably be -rejected. - - Berkeley Yacc is distributed with no warranty whatever. The code -is certain to contain errors. Neither the author nor any contributor -takes responsibility for any consequences of its use. - - Berkeley Yacc is in the public domain. The data structures and algorithms -used in Berkeley Yacc are all either taken from documents available to the -general public or are inventions of the author. Anyone may freely distribute -source or binary forms of Berkeley Yacc whether unchanged or modified. -Distributers may charge whatever fees they can obtain for Berkeley Yacc. -Programs generated by Berkeley Yacc may be distributed freely. - - Please report bugs to - - robert.corbett@eng.Sun.COM - -Include a small example if possible. Please include the banner string from -skeleton.c with the bug report. Do not expect rapid responses. -------------------------------------------------------------------------------- +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: luit +Upstream-Contact: <dickey@invisible-island.net> (Thomas E. Dickey) +Source: https://invisible-island.net/byacc/ + +Files: * +Copyright: 2001-2021,2022 by Thomas E. Dickey +License: public-domain + Berkeley Yacc is in the public domain; changes made to it by the current + maintainer are likewise unrestricted. That applies to most of the files. + A few files (currently those related to autoconf scripting) have other + licenses as noted here. + . + Current byacc upstream maintainer: Thomas Dickey <dickey@invisible-island.net> + . + Public domain notice and no warranty: + ------------------------------------------------------------------------------- + Berkeley Yacc is an LALR(1) parser generator. Berkeley Yacc has been made + as compatible as possible with AT&T Yacc. Berkeley Yacc can accept any input + specification that conforms to the AT&T Yacc documentation. Specifications + that take advantage of undocumented features of AT&T Yacc will probably be + rejected. + . + Berkeley Yacc is distributed with no warranty whatever. The code + is certain to contain errors. Neither the author nor any contributor + takes responsibility for any consequences of its use. + . + Berkeley Yacc is in the public domain. The data structures and algorithms + used in Berkeley Yacc are all either taken from documents available to the + general public or are inventions of the author. Anyone may freely distribute + source or binary forms of Berkeley Yacc whether unchanged or modified. + Distributers may charge whatever fees they can obtain for Berkeley Yacc. + Programs generated by Berkeley Yacc may be distributed freely. + . + Please report bugs to + . + robert.corbett@eng.Sun.COM + . + Include a small example if possible. Please include the banner string from + skeleton.c with the bug report. Do not expect rapid responses. + ------------------------------------------------------------------------------- Files: aclocal.m4 -Licence: other-BSD Copyright: 2004-2021,2022 by Thomas E. Dickey +License: other-BSD Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -44,10 +50,10 @@ Copyright: 2004-2021,2022 by Thomas E. Dickey distribute, distribute with modifications, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + . The above copyright notice and this permission notice shall be included in all copies or portions of the Software. - + . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -55,7 +61,7 @@ Copyright: 2004-2021,2022 by Thomas E. Dickey DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + . Except as contained in this notice, the name(s) of the above copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written @@ -63,42 +69,42 @@ Copyright: 2004-2021,2022 by Thomas E. Dickey Files: install-sh Copyright: 1994 X Consortium -Licence: other-BSD +License: other-BSD Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - + . Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other deal- ings in this Software without prior written authorization from the X Consor- tium. - + . FSF changes to this file are in the public domain. - + . Calling this script install-sh is preferred over install.sh, to prevent `make' implicit rules from creating a file called install from it when there is no Makefile. - + . This script is compatible with the BSD install script, but was written from scratch. It can only install one file at a time, a restriction shared with many OS's install programs. Files: package/debian/* Copyright: 2012-2020,2021 Thomas E. Dickey -Licence: other-BSD +License: other-BSD Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that @@ -107,7 +113,7 @@ Licence: other-BSD copyright holder(s) not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. - + . THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE @@ -116,5 +122,8 @@ Licence: other-BSD ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -On Debian systems, the complete text of the GNU General -Public License can be found in '/usr/share/common-licenses/GPL-2' +Files: config.guess config.sub +Copyright: 1992-2021 Free Software Foundation, Inc. +License: GPL-3 + On Debian systems, the complete text of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-3' diff --git a/package/debian/rules b/package/debian/rules index acd148e..4c56a9e 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# $Id: rules,v 1.7 2022/01/01 13:01:37 tom Exp $ +# $Id: rules,v 1.8 2022/01/08 19:53:07 tom Exp $ # # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -11,9 +11,11 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) PACKAGES.arch = byacc byacc2 -CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) +QA_FIX = DEB_BUILD_MAINT_OPTIONS="hardening=+all qa=+bug reproducible=+all" + +CPPFLAGS := $(shell $(QA_FIX) dpkg-buildflags --get CPPFLAGS) +CFLAGS := $(shell $(QA_FIX) dpkg-buildflags --get CFLAGS) +LDFLAGS := $(shell $(QA_FIX) dpkg-buildflags --get LDFLAGS) ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 diff --git a/package/debian/watch b/package/debian/watch index 2cc2e15..bf42035 100644 --- a/package/debian/watch +++ b/package/debian/watch @@ -1,4 +1,23 @@ -version=3 +version=4 -opts=passive ftp://ftp.invisible-island.net/byacc/byacc-(\d+)\.tgz \ - debian uupdate +# upstream provides tarballs such as "byacc-20220101.tgz" (originally to +# keep the filenames compatible with systems where multiple "." are illegal). +# +# The version number (2.0) is current since late 2020; before that it was +# "1.9" for a long time. Use +# byacc -V +# to see the version number: +# byacc - 2.0 20220101 +# +# The introduction of the back-tracking configuration motivated the change of +# major/minor numbers; for compatibility the parser skeleton still says "1.9". +# +# Patch-dates are always # in yyyymmdd format. + +opts=pgpsigurlmangle=s/.*/$0.asc/,\ +dversionmangle=s/^\d\.\d\.(\d+)/$1/,\ +filenamemangle=s/^.*\/(byacc)-(\d+)\.tgz/$1_2.0.$2.orig.tar.gz/ \ + https://invisible-mirror.net/archives/byacc/byacc-(\d+)\.tgz + +#opts=pgpsigurlmangle=s/.*/$0.asc/ +# https://invisible-mirror.net/archives/byacc/byacc-(\d+)\.tgz diff --git a/package/mingw-byacc.spec b/package/mingw-byacc.spec index b3b95a9..60ad973 100644 --- a/package/mingw-byacc.spec +++ b/package/mingw-byacc.spec @@ -1,16 +1,17 @@ -Summary: byacc - public domain Berkeley LALR Yacc parser generator -%define AppProgram byacc -%define AppVersion 20220101 -%define UseProgram yacc -# $Id: mingw-byacc.spec,v 1.39 2022/01/01 12:06:35 tom Exp $ -Name: %{AppProgram} -Version: %{AppVersion} +Summary: public domain Berkeley LALR Yacc parser generator + +%global AppVersion 2.0 +%global AppPatched 20220109 + +%global UseProgram yacc + +# $Id: mingw-byacc.spec,v 1.42 2022/01/09 20:03:00 tom Exp $ +Name: byacc +Version: %{AppVersion}.%{AppPatched} Release: 1 License: Public Domain, MIT -Group: Applications/Development -URL: ftp://invisible-island.net/%{AppProgram} -Source0: %{AppProgram}-%{AppVersion}.tgz -Packager: Thomas Dickey <dickey@invisible-island.net> +URL: https://invisible-island.net/%{name}/ +Source0: https://invisible-mirror.net/archives/%{name}/%{name}-%{AppPatched}.tgz %description This package provides a parser generator utility that reads a grammar @@ -21,9 +22,9 @@ license which includes the generated C. %prep -%define debug_package %{nil} +%global debug_package %{nil} -%setup -q -n %{AppProgram}-%{AppVersion} +%setup -q -n %{name}-%{AppPatched} %build %configure --verbose \ @@ -39,23 +40,27 @@ make %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -( cd $RPM_BUILD_ROOT%{_bindir} && ln -s %{AppProgram} %{UseProgram} ) +make install DESTDIR=$RPM_BUILD_ROOT +( cd $RPM_BUILD_ROOT%{_bindir} && ln -s %{name} %{UseProgram} ) -strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram} +strip $RPM_BUILD_ROOT%{_bindir}/%{name} %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%{_prefix}/bin/%{AppProgram} -%{_prefix}/bin/%{UseProgram} -%{_mandir}/man1/%{AppProgram}.* +%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README +%license LICENSE +%{_bindir}/%{name} +%{_bindir}/%{UseProgram} +%{_mandir}/man1/%{name}.* %changelog # each patch should add its ChangeLog entries here +* Sun Jan 09 2022 Thomas Dickey +- rpmlint + * Sun Jul 09 2017 Thomas Dickey - use predefined "configure" diff --git a/package/pkgsrc/Makefile b/package/pkgsrc/Makefile index d0051f9..5b753fb 100644 --- a/package/pkgsrc/Makefile +++ b/package/pkgsrc/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.24 2021/08/14 01:04:32 mef Exp $ # -DISTNAME= byacc-20220101 +DISTNAME= byacc-20220109 CATEGORIES= devel MASTER_SITES= https://invisible-mirror.net/archives/byacc/ DIST_SUBDIR= byacc-20220101 |