11 files changed, 111 insertions, 142 deletions
diff --git a/debian/changelog b/debian/changelog
index 758090e..03220df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libscrypt (1.20-1) experimental; urgency=low
+
+  * ACK NMUs, thanks for the fixes.
+  * New upstream release (Closes: #746041).
+    - Drop patches from NMUs due to inclusion of equivalent changes upstream.
+  * Add myself as co-maintainer.
+  * Bump Standards-Version.
+  * Add a symbols file.
+  * Tweak -dev package description.
+  * Update Vcs-* fields.
+  * Update copyright file.
+
+ -- Tristan Seligmann <mithrandi@debian.org>  Sun, 14 Dec 2014 05:28:49 +0200
+
 libscrypt (1-2.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 981b11e..7667bba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: libscrypt
 Priority: extra
 Maintainer: Micah Anderson <micah@debian.org>
+Uploaders: Tristan Seligmann <mithrandi@debian.org>
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Section: libs
 Homepage: http://www.lolware.net/libscrypt.html
-Vcs-Git: git://git.debian.org/collab-maint/libscrypt.git
-Vcs-Browser: http://git.debian.org/?p=collab-maint/libscrypt.git;a=summary
+Vcs-Git: git://anonscm.debian.org/collab-maint/libscrypt.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/libscrypt.git
 
 Package: libscrypt-dev
 Section: libdevel
@@ -18,12 +19,9 @@ Description: scrypt shared library - development files
  is intended to make it costly to perform large-scale hardware
  attacks.
  . 
- This package contains a shared library implementing the scrypt
- algorithm, based on the original implementation with a number of
- harnesses and simplified interfaces.
+ This package contains files for development with libscrypt.
 
 Package: libscrypt0
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: scrypt shared library
diff --git a/debian/copyright b/debian/copyright
index 3ac7de8..df0e411 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,65 +4,54 @@ Source: https://github.com/technion/libscrypt
 
 Files: *
 Copyright: 2013 Joshua Small <technion@lolware.net>
-License: BSD-2-Clause
+License: BSD-2-clause
 
-License: BSD-2-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- 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.
- .  
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
-
-Files: modp_b64.*
-Copyright: 2005, 2006, 2007  Nick Galbreath -- nickg [at] modp [dot] com
-License: BSD-3-Clause
-
-License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+Files: b64.*
+Copyright: 1995 International Business Machines, Inc.
+           1996 Internet Software Consortium
+License: ISC and IBM
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
  .
-  Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
+ THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ SOFTWARE.
  .
-  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.
+ International Business Machines, Inc. (hereinafter called IBM) grants
+ permission under its copyrights to use, copy, modify, and distribute this
+ Software with or without fee, provided that the above copyright notice and
+ all paragraphs of this notice appear in all copies, and that the name of IBM
+ not be used in connection with the marketing of any product incorporating
+ the Software or modifications thereof, without specific, written prior
+ permission.
  .
-  Neither the name of the modp.com nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+ To the extent it has a right to do so, IBM grants an immunity from suit
+ under its patents, if any, for the use, sale or manufacture of products to
+ the extent that such products are used for performing Domain Name System
+ dynamic updates in TCP/IP networks by means of the Software.  No immunity is
+ granted for any product per se or for any other function of any product.
  .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
- OWNER 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.
+ THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
+ DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
+ IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+Files: crypto_scrypt-nosse.c sha256.* sysendian.h
+Copyright: 2005, 2007-2009 Colin Percival <cperciva@tarsnap.com>
+License: BSD-2-clause
 
 Files: debian/*
 Copyright: 2013 Micah Anderson <micah@debian.org>
-License: GPL-3+
+           2014 Tristan Seligmann <mithrandi@debian.org>
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
@@ -79,3 +68,24 @@ License: GPL-3+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ 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.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
diff --git a/debian/libscrypt0.symbols b/debian/libscrypt0.symbols
new file mode 100644
index 0000000..89f4a5b
--- /dev/null
+++ b/debian/libscrypt0.symbols
@@ -0,0 +1,7 @@
+libscrypt.so.0 libscrypt0 #MINVER#
+ libscrypt@libscrypt 1
+ libscrypt_check@libscrypt 1
+ libscrypt_hash@libscrypt 1
+ libscrypt_mcf@libscrypt 1
+ libscrypt_salt_gen@libscrypt 1
+ libscrypt_scrypt@libscrypt 1
diff --git a/debian/libscrypt1.dirs b/debian/libscrypt1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libscrypt1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/patches/big-endian.patch b/debian/patches/big-endian.patch
deleted file mode 100644
index 60c9868..0000000
--- a/debian/patches/big-endian.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Aurelien Jarno <aurel32@debian.org>
-Subject: libscrypt: FTBFS on big endian architecture
-Date: Wed, 30 Oct 2013 00:09:08 +0100
-
-Version: 1-2
-Severity: important
-Tags: upstream patch
-Justification: fails to build from source
-
-libscrypt fails to build from source on big endian architectures, due
-to testsuite errors:
-
-| TEST EIGHT: Create an MCF format output
-| TEST EIGHT: SUCCESSFUL, calculated mcf
-| $s1$0e0801$U29kaXVtQ2hsb3JpZGU=$cCO9yzr9c0hGHAbNgf046/2o+7qQT44+qbVD9lRdofLVQylVYT8Pz2LUlwUkKpr55h6F3A1lHkDfzwF7RVdYhw==
-| TEST NINE: Password verify on given MCF
-| TEST NINE: FAILED, hash failed to calculate
-| make[1]: *** [check] Error 1
-
-This is due to code in modp_b64.c which is endianness dependent. A big
-and a little endian version of the code are provided, but the selection
-mechanism is supposed to be done by modifying the source code, which is
-not really compatible with a Debian source package. This leads to the
-little endian code to be always used.
-
-The patch below fixes the problem by getting the endianness from
-<endian.h>.
-
-It has been tested on mips, powerpc and s390x.
-
-Index: libscrypt-1/modp_b64.c
-===================================================================
---- libscrypt-1.orig/modp_b64.c
-+++ libscrypt-1/modp_b64.c
-@@ -45,10 +45,14 @@
- #include "modp_b64.h"
- 
- 
--/* if on motoral, sun, ibm; uncomment this */
--/* #define WORDS_BIGENDIAN 1 */
--/* else for Intel, Amd; uncomment this */
--/* #undef WORDS_BIGENDIAN */
-+#include <endian.h>
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+# define WORDS_BIGENDIAN 1
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
-+# undef WORDS_BIGENDIAN
-+#else
-+#error "Unknown endianess"
-+#endif
- 
- #include "modp_b64_data.h"
- 
diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile
new file mode 100644
index 0000000..23b7868
--- /dev/null
+++ b/debian/patches/fix-makefile
@@ -0,0 +1,21 @@
+Description: Fix makefile flag handling
+Author: Tristan Seligmann <mithrandi@debian.org>
+Origin: vendor
+Forwarded: no
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: libscrypt/Makefile
+===================================================================
+--- libscrypt.orig/Makefile	2014-12-14 02:38:36.667099740 +0200
++++ libscrypt/Makefile	2014-12-14 05:53:34.488194255 +0200
+@@ -5,8 +5,8 @@
+ INSTALL_DATA ?= install
+ 
+ CC?=gcc
+-CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC
+-LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
++CFLAGS += -Wall -fPIC
++LDFLAGS += -Wl,-z,now -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
+ CFLAGS_EXTRA?=-Wl,-rpath=.
+ 
+ all: reference
diff --git a/debian/patches/fix_makefile b/debian/patches/fix_makefile
deleted file mode 100644
index 872015b..0000000
--- a/debian/patches/fix_makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,9 @@
-+PREFIX       = /usr/local
-+LIBDIR       = $(PREFIX)/lib
-+INCLUDEDIR   = $(PREFIX)/include
-+MAKE_DIR     = install -d
-+INSTALL_DATA = install -m 0644
-+
- CC=gcc
- CFLAGS=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC
- all: reference
-@@ -26,7 +32,8 @@
- 	valgrind ./reference
- 
- install: library
--	install -m 0644 libscrypt.a $(DESTDIR)/usr/local/lib
--	install -m 0644 libscrypt.so.0 $(DESTDIR)/usr/local/lib
--	ln -s -f $(DESTDIR)/usr/local/lib/libscrypt.so.0 $(DESTDIR)/usr/local/lib/libscrypt.so
--	install -m 0644 libscrypt.h  $(DESTDIR)/usr/local/include
-+	$(MAKE_DIR) $(DESTDIR) $(DESTDIR)$(PREFIX) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR)
-+	$(INSTALL_DATA) libscrypt.a $(DESTDIR)$(LIBDIR)
-+	$(INSTALL_DATA) libscrypt.so.0 $(DESTDIR)$(LIBDIR)
-+	ln -s -f libscrypt.so.0 $(DESTDIR)$(LIBDIR)/libscrypt.so
-+	$(INSTALL_DATA) libscrypt.h  $(DESTDIR)$(INCLUDEDIR)
diff --git a/debian/patches/series b/debian/patches/series
index 5d020e2..4f20ff2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_makefile
-big-endian.patch
+fix-makefile
diff --git a/debian/rules b/debian/rules
index 2dfe8b7..cf18250 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 export DH_VERBOSE=1
 
 %:
-	dh $@ 
+	dh $@
 
 override_dh_auto_install:
-	$(MAKE) DESTDIR=debian/tmp PREFIX=/usr install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr install install-static
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index 637ff02..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1 +0,0 @@
-liblibscrypt 0.1 libscrypt (>> 0.1-0), libscrypt (<< 0.1-99)