[Pkg-samba-maint] [samba] 05/20: Drop 0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch: upstream no longer uses getpass.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch samba_4.1
in repository samba.

commit 57c270d118017480d163907a69a5e3a1b671b92b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Nov 16 16:31:31 2013 +0000

    Drop 0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch: upstream no longer uses getpass.
---
 debian/changelog                                   |  2 +
 ...-Allow-OS-vendor-to-assert-that-getpass-i.patch | 57 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  3 +-
 4 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 567e915..1c95728 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 samba (2:4.1.1+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
+   + Drop 0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch:
+     upstream no longer uses getpass.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 17 Nov 2013 11:47:57 +0000
 
diff --git a/debian/patches/0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch b/debian/patches/0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch
deleted file mode 100644
index c482fb5..0000000
--- a/debian/patches/0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From adb5d56ca130fd2dbe94d49c631c25b288414516 Mon Sep 17 00:00:00 2001
-From: Andrew Bartlett <abartlet at samba.org>
-Date: Tue, 20 Nov 2012 09:52:27 +1100
-Subject: [PATCH 2/8] lib/replace: Allow OS vendor to assert that getpass() is
- not 8-char limited
-
-This allows libreplace to be a no-op on Linux.
-
-Ideally this would be a waf test, but this is difficult as we have
-to fake up a full pty environment.  For now, allow a distribution
-to assert it manually.
-
-Andrew Bartlett
----
- lib/replace/wscript | 23 ++++++++++++++---------
- 1 file changed, 14 insertions(+), 9 deletions(-)
-
---- a/lib/replace/wscript
-+++ b/lib/replace/wscript
-@@ -22,6 +22,10 @@
-     opt.BUILTIN_DEFAULT('NONE')
-     opt.PRIVATE_EXTENSION_DEFAULT('')
-     opt.RECURSE('buildtools/wafsamba')
-+    opt.add_option('--without-getpass-replacement',
-+                   help='disable getpass() replacement (this asserts that the host OS is like Linux, and has an unlimited-length getpass.',
-+                   action='store_true', dest='without_getpass_replacement', default=False)
-+
- 
- @wafsamba.runonce
- def configure(conf):
-@@ -512,16 +516,17 @@
-                            execute=True):
-             break
- 
--    if conf.CHECK_FUNCS('getpass getpassphrase'):
--        # if we have both, then we prefer getpassphrase
--        conf.DEFINE('REPLACE_GETPASS_BY_GETPASSPHRASE', 1)
--        conf.DEFINE('REPLACE_GETPASS', 1)
--    else:
--        conf.CHECK_CODE('''#include "getpass.c"
-+    if not Options.options.without_getpass_replacement:
-+        if conf.CHECK_FUNCS('getpass getpassphrase'):
-+            # if we have both, then we prefer getpassphrase
-+            conf.DEFINE('REPLACE_GETPASS_BY_GETPASSPHRASE', 1)
-+            conf.DEFINE('REPLACE_GETPASS', 1)
-+        else:
-+            conf.CHECK_CODE('''#include "getpass.c"
-                        int main(void) { return 0; }''',
--                    addmain=False,
--                    define='REPLACE_GETPASS',
--                    cflags='-DNO_CONFIG_H')
-+                            addmain=False,
-+                            define='REPLACE_GETPASS',
-+                            cflags='-DNO_CONFIG_H')
- 
-     conf.RECURSE('system')
-     conf.SAMBA_CONFIG_H()
diff --git a/debian/patches/series b/debian/patches/series
index 4a63691..34e4b4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch
 05_share_ldb_module
 07_private_lib
 25_heimdal_api_changes
diff --git a/debian/rules b/debian/rules
index 985a34c..70ca9ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,8 +62,7 @@ conf_args = \
 		--disable-rpath-install \
 		--bundled-libraries=NONE,pytevent,iniparser \
 		--builtin-libraries=replace,ccan \
-		--minimum-library-version="$(shell ./debian/autodeps.py --minimum-library-version)" \
-		--without-getpass-replacement
+		--minimum-library-version="$(shell ./debian/autodeps.py --minimum-library-version)"
 
 %:
 	dh $* --with python2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git