--- rs-20120414.orig/debian/compat +++ rs-20120414/debian/compat @@ -0,0 +1 @@ +5 --- rs-20120414.orig/debian/changelog +++ rs-20120414/debian/changelog @@ -0,0 +1,33 @@ +rs (20120414-1) unstable; urgency=medium + + * Updated upstream version (Closes: #668306) + - also fix manpage portability + - no longer uses unreliable libbsd header files + * Add a testsuite to prevent issues like #668306 from happening again + + -- Thorsten Glaser Sat, 14 Apr 2012 13:22:33 +0000 + +rs (20120325-1) unstable; urgency=low + + * debian/rules: cleanup (remove install/check, dh_installdirs) + * Updated upstream version (Closes: #650029) + * debian/control: Policy 3.9.3 (no relevant changes) + * debian/rules: modernise; enable +all hardening + + -- Thorsten Glaser Sun, 25 Mar 2012 16:08:46 +0000 + +rs (20101029-1) unstable; urgency=low + + * rs can do Multi-Arch: foreign as requested by vorlon. + * Let Mika co-maintain this package. + * Upload to unstable. + + -- Thorsten Glaser Sun, 27 Feb 2011 21:49:05 +0000 + +rs (20101029-0wtf1) experimental; urgency=low + + * Initial package. Since NEW is currently not processed, this is + uploaded to the Grml repository for now, tested there and, once + unfrozen, will be uploaded to Debian in a new version. + + -- Thorsten Glaser Sat, 30 Oct 2010 14:29:20 +0000 --- rs-20120414.orig/debian/watch +++ rs-20120414/debian/watch @@ -0,0 +1,4 @@ +# $MirOS: contrib/hosted/tg/deb/rs/debian/watch,v 1.1 2010/10/30 14:35:40 tg Exp $ + +version=3 +http://www.mirbsd.org/MirOS/dist/mir/rs/ rs-(.*)\.tar\.gz --- rs-20120414.orig/debian/install +++ rs-20120414/debian/install @@ -0,0 +1,3 @@ +# $MirOS: contrib/hosted/tg/deb/rs/debian/install,v 1.1 2010/10/30 14:35:40 tg Exp $ +#- +rs usr/bin/ --- rs-20120414.orig/debian/control +++ rs-20120414/debian/control @@ -0,0 +1,27 @@ +# $MirOS: contrib/hosted/tg/deb/rs/debian/control,v 1.3 2012/03/25 16:08:54 tg Exp $ +# +Source: rs +Section: utils +Priority: optional +Maintainer: Thorsten Glaser +Uploaders: Michael Prokop +# possibly works with older libbsd-dev, but haven’t tested how old +Build-Depends: debhelper (>= 5), libbsd-dev (>= 0.2.0-1~) +Standards-Version: 3.9.3 +# First word is the $CVSROOT (-d arg) string, second word the module. +# Upstream is on the same server, in the "src/usr.bin/rs" module. +Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/rs +Vcs-Browser: http://cvs.mirbsd.de/contrib/hosted/tg/deb/rs/ + +Package: rs +Architecture: any +Multi-Arch: foreign +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: reshape a data array + rs reads the standard input, interpreting each line as a row of + blank-separated entries in an array, transforms the array + according to the options, and writes it on the standard output. + Numerous options control input, reshaping and output processing; + the simplest usage example is "ls -1 | rs", which outputs the + same (on an 80-column terminal) as the modern "ls" with no "-1" + argument. --- rs-20120414.orig/debian/copyright +++ rs-20120414/debian/copyright @@ -0,0 +1,43 @@ +This package was debianised by Thorsten Glaser on +Sat Oct 30 14:32:34 UTC 2010. + +$MirOS: contrib/hosted/tg/deb/rs/debian/copyright,v 1.3 2012/04/14 12:59:51 tg Exp $ + +It was downloaded from: +https://www.mirbsd.org/MirOS/dist/mir/rs/rs-20120414.tar.gz + + +Author: John Kunze, Office of Comp. Affairs, UCB + +Licence: + +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 2008, 2009, 2010, 2012 + * Thorsten “mirabilos” Glaser + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ --- rs-20120414.orig/debian/rules +++ rs-20120414/debian/rules @@ -0,0 +1,72 @@ +#!/usr/bin/make -f +# $MirOS: contrib/hosted/tg/deb/rs/debian/rules,v 1.4 2012/04/14 13:16:06 tg Exp $ + +CC?= gcc +EXTRA_CFLAGS= -Wall -Wextra -Wformat +EXTRA_CPPFLAGS= -DUSE_LIBBSD +EXTRA_LDFLAGS= -Wl,--as-needed + +ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk)) +# dpkg-dev (>= 1.16.1~) +DEB_CFLAGS_MAINT_APPEND=${EXTRA_CFLAGS} +DEB_CPPFLAGS_MAINT_APPEND=${EXTRA_CPPFLAGS} +DEB_LDFLAGS_MAINT_APPEND=${EXTRA_LDFLAGS} +DEB_BUILD_MAINT_OPTIONS=hardening=+all +include /usr/share/dpkg/buildflags.mk +else +# old-fashioned way to determine build flags +CFLAGS= -O$(if $(findstring noopt,${DEB_BUILD_OPTIONS}),0,2) -g +CFLAGS+= ${EXTRA_CFLAGS} +CPPFLAGS+= ${EXTRA_CPPFLAGS} +LDFLAGS+= ${EXTRA_LDFLAGS} +endif + +LDADD+= -lbsd + +build build-arch: rs +build-indep: + +rs: + dh_testdir + -rm -f rs + +for opts in '-flto=jobserver' '-fwhole-program --combine' ''; do \ + set -x; \ + ${CC} ${CPPFLAGS} ${CFLAGS} $$opts ${LDFLAGS} -o rs \ + rs.c ${LDADD}; \ + test -x rs && exit 0; \ + done; echo >&2 Compiling failed.; exit 1 +ifeq (,$(filter nocheck,${DEB_BUILD_OPTIONS})) + case $$(for i in 1 2 3 4 5 6 7 8 9; do echo $$i; done | \ + ./rs 3 3 | md5sum) in \ + d37c2eb45172c55279711a8e53041912*) echo pass test;; \ + *) rm -f rs; echo FAIL test;; \ + esac; test -x rs +endif + +clean: + dh_testdir + -rm -f rs + dh_clean + +binary-indep: build-indep + +binary-arch: build-arch + dh_testdir + dh_testroot + if test -x "$$(which dh_prep)"; then dh_prep; else dh_clean -k; fi + dh_installchangelogs + dh_installdocs + dh_install + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: binary binary-arch binary-indep build build-arch build-indep clean --- rs-20120414.orig/debian/manpages +++ rs-20120414/debian/manpages @@ -0,0 +1,3 @@ +# $MirOS: contrib/hosted/tg/deb/rs/debian/manpages,v 1.1 2010/10/30 14:35:40 tg Exp $ +#- +rs.1 --- rs-20120414.orig/debian/source/format +++ rs-20120414/debian/source/format @@ -0,0 +1 @@ +1.0