Add changelog for Freight 0.3.13

.gitignore

@@ -7,5 +7,10 @@
 *.orig.tar.gz
 *.tar.gz
 *~
+.idea/
 etc/freight.conf
 var
+test/tmp
+!test/fixtures/*
+debian/freight*
+debian/files

.travis.yml

@@ -0,0 +1,12 @@
+sudo: required
+env:
+  - SH=dash
+  - SH=bash
+script:
+  - find bin lib -type f | xargs shellcheck -s sh
+  - shfmt -i 4 -ci -p -l -s -w lib/ bin/
+  - git diff --exit-code
+  - make check
+notifications:
+  irc: "chat.freenode.net#freight"
+dist: xenial

Makefile

@@ -1,6 +1,8 @@
-VERSION=0.3.5
+VERSION=0.3.12
 BUILD=1
 
+SH=dash
+
 prefix=/usr/local
 bindir=${prefix}/bin
 libdir=${prefix}/lib
@@ -10,7 +12,7 @@ mandir=${prefix}/share/man
 all:
 
 clean:
-	rm -rf *.deb debian man/man*/*.html
+	rm -rf *.deb deb man/man*/*.html test/tmp
 	find . -name '*~' -delete
 
 install: install-bin install-lib install-man install-sysconf
@@ -23,7 +25,7 @@ install-lib:
 
 install-man:
 	find man -type f -name \*.[12345678] -printf %P\\0 | xargs -0r -I__ install -m644 -D man/__ $(DESTDIR)$(mandir)/__
-	find man -type f -name \*.[12345678] -printf %P\\0 | xargs -0r -I__ gzip $(DESTDIR)$(mandir)/__
+	find man -type f -name \*.[12345678] -printf %P\\0 | xargs -0r -I__ gzip -f $(DESTDIR)$(mandir)/__
 
 install-sysconf:
 	find etc -type f -not -name freight.conf -printf %P\\0 | xargs -0r -I__ install -m644 -D etc/__ $(DESTDIR)$(sysconfdir)/__
@@ -50,19 +52,15 @@ uninstall-sysconf:
 	rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(sysconfdir) || true
 
 build:
-	make install prefix=/usr sysconfdir=/etc DESTDIR=debian
+	make install prefix=/usr sysconfdir=/etc DESTDIR=deb
 	fpm -s dir -t deb \
 		-n freight -v $(VERSION) --iteration $(BUILD) -a all \
 		-d coreutils -d dash -d dpkg -d gnupg -d grep \
 		-m "Richard Crowley <[email protected]>" \
-		--url "https://github.com/rcrowley/freight" \
+		--url "https://github.com/freight-team/freight" \
 		--description "A modern take on the Debian archive." \
-		-C debian .
-	make uninstall prefix=/usr sysconfdir=/etc DESTDIR=debian
-
-deploy:
-	scp freight_$(VERSION)-$(BUILD)_all.deb [email protected]:
-	ssh -t [email protected] "freight add freight_$(VERSION)-$(BUILD)_all.deb apt/squeeze apt/wheezy apt/sid apt/lucid apt/precise apt/quantal apt/raring apt/saucy apt/trusty && rm freight_$(VERSION)-$(BUILD)_all.deb && freight cache apt/squeeze apt/wheezy apt/sid apt/lucid apt/precise apt/quantal apt/raring apt/saucy apt/trusty"
+		-C deb .
+	make uninstall prefix=/usr sysconfdir=/etc DESTDIR=deb
 
 man:
 	find man -name \*.ronn | xargs -n1 ronn --manual=Freight --style=toc
@@ -83,4 +81,19 @@ gh-pages: man
 	git push origin gh-pages
 	git checkout -q master
 
-.PHONY: all install uninstall deb deploy man gh-pages
+test/tmp/bats:
+	git clone --depth 1 https://github.com/sstephenson/bats.git test/tmp/bats
+
+test/tmp/bats-assert:
+	git clone --depth 1 https://github.com/jasonkarns/bats-assert.git test/tmp/bats-assert
+
+test/tmp/bin:
+	mkdir -p test/tmp/bin
+
+test/tmp/bin/sh: test/tmp/bin
+	ln -sf $$(which $(SH)) test/tmp/bin/sh
+
+check: test/tmp/bats test/tmp/bats-assert test/tmp/bin/sh
+	PATH=test/tmp/bin/:$$PATH test/tmp/bats/bin/bats test/
+
+.PHONY: all clean install uninstall build man docs gh-pages check

README.md

@@ -1,7 +1,18 @@
 # Freight
 
+[![IRC channel](https://kiwiirc.com/buttons/irc.freenode.net/freight.png)](https://kiwiirc.com/client/irc.freenode.net/?#freight)
+[![Build Status](https://travis-ci.org/freight-team/freight.svg?branch=master)](https://travis-ci.org/freight-team/freight)
+
 A modern take on the Debian archive.
 
+This repository has been forked (in the traditional sense of the word) from
+Richard Crowley's [freight](https://github.com/rcrowley/freight) repository. A
+fork had become necessary because the main project was not actively maintained
+and serious issues had started to crop up. While fixes and improvements were
+available in various freight GitHub forks, they were not merged to the main
+project. This fork and the associated GitHub organization,
+[freight-team](https://github.com/freight-team), attempts to fix these issues.
+
 ## Usage
 
 Install Freight and create a minimal configuration in `/usr/local/etc/freight.conf` or `/etc/freight.conf` as appropriate containing the name of your GPG key:
@@ -16,27 +27,44 @@ Build the cache of all the files needed to be accepted as a Debian archive:
 
 	freight cache
 
+If your system has GnuPG 2.x make sure that a gpg-agent is running and that you 
+have installed a pinentry package (e.g. pinentry-curses) that suits your needs. 
+On freight 0.3.11 and older you may also need to set the GPG_TTY environment 
+variable like this:
+
+    export GPG_TTY=$(tty)
+
 Serve `/var/cache/freight` via your favorite web server and install it as an APT source:
 
 	echo "deb http://example.com $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/example.list
 	sudo wget -O /etc/apt/trusted.gpg.d/example.gpg http://example.com/keyring.gpg
 	sudo apt-get update
 	sudo apt-get -y install foobar
 
+Make sure your webserver is configured to follow symlinks inside of the hosted directory. 
+
 ## Installation
 
 ### From source
 
-	git clone git://github.com/rcrowley/freight.git
+	git clone git://github.com/freight-team/freight.git
 	cd freight && make && sudo make install
 
 ### From a Debian archive
 
-	echo "deb http://packages.rcrowley.org $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/rcrowley.list
-	sudo wget -O /etc/apt/trusted.gpg.d/rcrowley.gpg http://packages.rcrowley.org/keyring.gpg
+	wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg|sudo apt-key add -
+	echo "deb http://build.openvpn.net/debian/freight_team $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/freight.list
 	sudo apt-get update
 	sudo apt-get -y install freight
 
+### From a custom-made Debian package
+
+You need `build-essential` package installed. Clone the freight repository, build a package and install it:
+
+	git clone git://github.com/freight-team/freight.git
+	cd freight && dpkg-buildpackage -uc -us -b
+	sudo dpkg -i ../freight_<version>-<build>_all.deb
+
 ### From Fedora/EPEL repositories
 
 EL users must first [configure EPEL](http://fedoraproject.org/wiki/EPEL/FAQ#How_can_I_install_the_packages_from_the_EPEL_software_repository.3F).
@@ -51,15 +79,27 @@ There's also [French documentation](http://blog.valouille.fr/2014/03/creer-un-de
 
 ## Manuals
 
-* [`freight`(1)](http://rcrowley.github.com/freight/freight.1.html)
-* [`freight-add`(1)](http://rcrowley.github.com/freight/freight-add.1.html)
-* [`freight-cache`(1)](http://rcrowley.github.com/freight/freight-cache.1.html)
-* [`freight`(5)](http://rcrowley.github.com/freight/freight.5.html)
+* [`freight`(1)](http://freight-team.github.io/freight/freight.1.html)
+* [`freight-add`(1)](http://freight-team.github.io/freight/freight-add.1.html)
+* [`freight-cache`(1)](http://freight-team.github.io/freight/freight-cache.1.html)
+* [`freight-clear-cache`(1)](http://freight-team.github.io/freight/freight-clear-cache.1.html)
+* [`freight-init`(1)](http://freight-team.github.io/freight/freight-init.1.html)
+* [`freight`(5)](http://freight-team.github.io/freight/freight.5.html)
 
 ## Contribute
 
-Freight is [BSD-licensed](https://github.com/rcrowley/freight/blob/master/LICENSE)
+Freight is [BSD-licensed](https://github.com/freight-team/freight/blob/master/LICENSE)
+
+* Source code: <https://github.com/freight-team/freight>
+* Issue tracker: <https://github.com/freight-team/freight/issues>
+* Wiki: <https://github.com/freight-team/freight/wiki>
+
+### Static analysis and code style
+
+[Shellcheck](https://www.shellcheck.net/) and [shfmt](https://github.com/mvdan/sh) are used to ensure consistency, please see the Travis configuration for the actual tests.
+
+### Test suite
+
+The Freight test suite can be executed by running `make check` from any git checkout of this repository. git and GnuPG are required for most tests, and extended tests require apt.
 
-* Source code: <https://github.com/rcrowley/freight>
-* Issue tracker: <https://github.com/rcrowley/freight/issues>
-* Wiki: <https://github.com/rcrowley/freight/wiki>
+Contributions should include a new test case where possible by extending one or more of the `test/*.bats` files.

bin/freight

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 # `freight` dispatches to `freight-*` commands.
 
@@ -7,13 +7,15 @@ set -e
 # Just like the DevStructure tools, which try to be just like Git, accept
 # a subcommand that really just completes the name of a real command.
 COMMAND=$0-$1
-[ -x $COMMAND ] && {
-	shift
-	exec $COMMAND "$@"
+[ -x "$COMMAND" ] && {
+    shift
+    exec "$COMMAND" "$@"
 }
 
 # Be helpful in this case since no subcommand was found.
-echo "Usage: $(basename $0) <command> [...]" >&2
+echo "Usage: $(basename "$0") <command> [...]" >&2
 echo "Common commands: add cache init" >&2
-echo "See all available commands by typing \"$(basename $0)-<TAB><TAB>\"" >&2
+echo "See all available commands by typing \"$(basename "$0")-<TAB><TAB>\"" >&2
 exit 1
+
+# vim: et:ts=4:sw=4

bin/freight-add

@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/usr/bin/env sh
+# shellcheck disable=SC1090
 
 # Add a package to the Freight library.
 
 #/ Usage: freight add [-c <conf>] [-v] [-h] <package> <manager>/<distro>...
 #/   -c <conf>, --conf=<conf> config file to parse
 #/   -v, --verbose            verbose mode
+#/   -e, --add-error          exit with error if package already added
 #/   -h, --help               show this help message
 
 set -e
@@ -13,33 +15,37 @@ usage() {
     grep "^#/" "$0" | cut -c"4-" >&2
     exit "$1"
 }
-while [ "$#" -gt 0 ]
-do
-	case "$1" in
-		-c|--conf) CONF="$2" shift 2;;
-		-c*) CONF="$(echo "$1" | cut -c"3-")" shift;;
-		--conf=*) CONF="$(echo "$1" | cut -c"8-")" shift;;
-		-v|--verbose) VERBOSE=1 shift;;
-		-h|--help) usage 0;;
-		-*) echo "# [freight] unknown switch: $1" >&2;;
-		*) break;;
-	esac
+while [ "$#" -gt 0 ]; do
+    case "$1" in
+        -c | --conf) CONF="$2" shift 2 ;;
+        -c*) CONF="$(echo "$1" | cut -c"3-")" shift ;;
+        --conf=*) CONF="$(echo "$1" | cut -c"8-")" shift ;;
+        -v | --verbose) VERBOSE=1 shift ;;
+        -e | --add-error) FREIGHT_ADD_ERROR="YES" shift ;;
+        -h | --help) usage 0 ;;
+        -*)
+            echo "# [freight] unknown switch: $1" >&2
+            usage 1
+            ;;
+        *) break ;;
+    esac
 done
 
-. "$(dirname $(dirname $0))/lib/freight/conf.sh"
+. "$(dirname "$(dirname "$0")")/lib/freight/conf.sh"
 
 # The non-option argument(s) following the last option are package files.
 # Binary packages have only one but source packages require two or three.
 # When the last of these is found, the remaining arguments are each assumed
 # to be `<manager>/<distro>` pairs for this (source) package.
-while [ "$#" -gt 0 ]
-do
-	case "$1" in
-		*.deb|*.dsc|*.orig.tar.gz|*.diff.gz|*.debian.tar.gz|*.tar.gz)
-			PATHNAMES="$PATHNAMES $1" shift;;
-		*.build|*.changes) shift;;
-		*) break;;
-	esac
+while [ "$#" -gt 0 ]; do
+    case "$1" in
+        *.deb | *.ddeb | *.dsc | *.orig.tar.gz | *.orig.tar.bz2 | *.orig.tar.xz | *.orig.tar.lzma | *.diff.gz | *.debian.tar.gz | *.debian.tar.bz2 | *.debian.tar.xz | *.debian.tar.lzma | *.tar.gz | *.tar.bz2 | *.tar.xz | *.tar.lzma)
+            # shellcheck disable=SC2153
+            PATHNAMES="$PATHNAMES $1" shift
+            ;;
+        *.build | *.changes) shift ;;
+        *) break ;;
+    esac
 done
 [ -z "$PATHNAMES" ] && usage 1
 [ -z "$*" ] && usage 1
@@ -49,10 +55,10 @@ done
 # later Freight commands will rely on the link count being reduced to one.
 mkdir -p "$VARLIB"
 TMP="$(mktemp -d "$VARLIB/freight.$$.XXXXXXXXXX")"
+# shellcheck disable=SC2064
 trap "rm -rf \"$TMP\"" EXIT INT TERM
-for PATHNAME in $PATHNAMES
-do
-	cp "$PATHNAME" "$TMP/"
+for PATHNAME in $PATHNAMES; do
+    cp "$PATHNAME" "$TMP/"
 done
 
 # Enter the Freight library directory so that items in `$@` may be given as
@@ -64,28 +70,30 @@ cd "$VARLIB"
 # PATHNAME.  The first two are given fairly directly to ln(1); the final one
 # is used to create appropriate success or failure messages.
 add() {
-    if ln "$TMP/$1" "$2/$1" 2>"$TMP/ln"
-    then echo "# [freight] added $3 to $2${4+" as "}$4" >&2
+    if ln "$TMP/$1" "$2/$1" 2>"$TMP/ln"; then
+        echo "# [freight] added $3 to $2${4+" as "}$4" >&2
     else
-        if grep -q "File exists" "$TMP/ln"
-        then echo "# [freight] $2 already has $3${4+" as "}$4" >&2
-        else cat "$TMP/ln" >&2
+        if grep -q "File exists" "$TMP/ln"; then
+            echo "# [freight] $2 already has $3${4+" as "}$4" >&2
+        else
+            cat "$TMP/ln" >&2
+        fi
+        if [ -n "$FREIGHT_ADD_ERROR" ]; then
+            exit 2
         fi
     fi
 }
 
 # Hard link this package into every `<manager>/<distro>` given in `$@`.
 # These links will later be used to compile the `Release` and `Packages`
 # files in the Freight cache.
-for PATHNAME in $PATHNAMES
-do
-	FILENAME="$(basename "$PATHNAME")"
-	for DIRNAME in "$@"
-	do
-		mkdir -p "$DIRNAME"
+for PATHNAME in $PATHNAMES; do
+    FILENAME="$(basename "$PATHNAME")"
+    for DIRNAME in "$@"; do
+        mkdir -p "$DIRNAME"
         case "$FILENAME" in
-            *_*_*.deb) add "$FILENAME" "$DIRNAME" "$PATHNAME";;
-            *.deb)
+            *_*_*.deb | *_*_*.ddeb) add "$FILENAME" "$DIRNAME" "$PATHNAME" ;;
+            *.deb | *.ddeb)
                 . "$(dirname "$(dirname "$0")")/lib/freight/apt.sh"
                 dpkg-deb -I "$TMP/$FILENAME" "control" >"$TMP/$FILENAME-control"
                 DEBNAME="$(
@@ -94,9 +102,12 @@ do
                     apt_binary_version "$TMP/$FILENAME-control"
                 )_$(
                     apt_binary_arch "$TMP/$FILENAME-control"
-                ).deb"
-                add "$FILENAME" "$DIRNAME" "$PATHNAME" "$DEBNAME";;
-            *) add "$FILENAME" "$DIRNAME" "$PATHNAME";;
+                ).${FILENAME##*.}"
+                add "$FILENAME" "$DIRNAME" "$PATHNAME" "$DEBNAME"
+                ;;
+            *) add "$FILENAME" "$DIRNAME" "$PATHNAME" ;;
         esac
-	done
+    done
 done
+
+# vim: et:ts=4:sw=4