Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: pu
User: [email protected]
Usertags: debian-edu I've been asked by the debian-edu people to upload a fix for smbldap-tools in stable, as the current version breaks their usage of the tool. I'm a attaching a debdiff with my proposed changes (in fact they are the fixes for bugs #700477 and #670246 that are already fixed upstream). Is there any problem if I upload the package to proposed-updates? Thanks in advance, Sergio. -- Sergio Talens-Oliag <[email protected]> <http://people.debian.org/~sto/> Key fingerprint = 29DF 544F 1BD9 548C 8F15 86EF 6770 052B B8C1 FA69
diff -Nru smbldap-tools-0.9.7/debian/changelog smbldap-tools-0.9.7/debian/changelog --- smbldap-tools-0.9.7/debian/changelog 2011-09-27 15:15:14.000000000 +0200 +++ smbldap-tools-0.9.7/debian/changelog 2013-08-05 11:47:56.000000000 +0200 @@ -1,3 +1,13 @@ +smbldap-tools (0.9.7-1+deb7u1) stable; urgency=low + + * Stable update to fix bug #700477 for Wheezy as requested by debian-edu + people (the bug is already fixed on the 0.9.9 upstream version that + has been available on unstable and tesing for almost a year now). + * Remove qw() warning, it is just a parenthesis and the warning is really + anoying. + + -- Sergio Talens-Oliag <[email protected]> Mon, 05 Aug 2013 11:46:37 +0200 + smbldap-tools (0.9.7-1) unstable; urgency=low * New upstream release diff -Nru smbldap-tools-0.9.7/debian/patches/0012_smbldap-tools-net-command-name.patch smbldap-tools-0.9.7/debian/patches/0012_smbldap-tools-net-command-name.patch --- smbldap-tools-0.9.7/debian/patches/0012_smbldap-tools-net-command-name.patch 1970-01-01 01:00:00.000000000 +0100 +++ smbldap-tools-0.9.7/debian/patches/0012_smbldap-tools-net-command-name.patch 2013-08-05 11:43:26.000000000 +0200 @@ -0,0 +1,26 @@ +From d0d155b8693650a54b452a80d17734968496c211 Mon Sep 17 00:00:00 2001 +From: fumiyas <fumiyas@69f2458b-35d4-408a-aa88-7d8d64836e89> +Date: Mon, 7 May 2012 06:58:27 +0000 +Subject: [PATCH] smbldap_tools.pm: Fix net(8) command name + +git-svn-id: svn+ssh://svn.gna.org/svn/smbldap-tools/trunk@134 69f2458b-35d4-408a-aa88-7d8d64836e89 +--- + smbldap_tools.pl | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/smbldap_tools.pl b/smbldap_tools.pl +index 6709860..7af50c3 100644 +--- a/smbldap_tools.pl ++++ b/smbldap_tools.pl +@@ -242,7 +242,7 @@ sub read_smbconf { + my %smbconf = read_smbconf(); + + sub getLocalSID { +- open my $fh, "-|" or exec("$samba_bindir/netx", "getlocalsid") || exit(1); ++ open my $fh, "-|" or exec("$samba_bindir/net", "getlocalsid") || exit(1); + + my $line = <$fh>; + if (!defined($line)) { +-- +1.7.10.4 + diff -Nru smbldap-tools-0.9.7/debian/patches/0013_qw_warning.patch smbldap-tools-0.9.7/debian/patches/0013_qw_warning.patch --- smbldap-tools-0.9.7/debian/patches/0013_qw_warning.patch 1970-01-01 01:00:00.000000000 +0100 +++ smbldap-tools-0.9.7/debian/patches/0013_qw_warning.patch 2013-08-05 11:39:16.000000000 +0200 @@ -0,0 +1,13 @@ +Index: smbldap-tools-0.9.7/smbldap_tools.pl +=================================================================== +--- smbldap-tools-0.9.7.orig/smbldap_tools.pl 2013-08-05 11:37:46.356270196 +0200 ++++ smbldap-tools-0.9.7/smbldap_tools.pl 2013-08-05 11:39:12.668112493 +0200 +@@ -1420,7 +1420,7 @@ + my $sig_sent = {}; + my $sig_hander = sub { $sig_sent->{shift(@_)} = 1; die; }; + +- for my $sig_name qw(ALRM INT HUP QUIT TERM TSTP TTIN TTOU) { ++ for my $sig_name (qw(ALRM INT HUP QUIT TERM TSTP TTIN TTOU)) { + $sig_handlers_orig->{$sig_name} = $SIG{$sig_name}; + $SIG{$sig_name} = $sig_hander; + } diff -Nru smbldap-tools-0.9.7/debian/patches/series smbldap-tools-0.9.7/debian/patches/series --- smbldap-tools-0.9.7/debian/patches/series 2011-09-27 15:13:56.000000000 +0200 +++ smbldap-tools-0.9.7/debian/patches/series 2013-08-05 11:38:07.000000000 +0200 @@ -2,3 +2,5 @@ 0002_smbldap-userlist_manpage_fix.patch 0010_use-Digest-SHA.patch 0011_fix_smbldap-grouplist_manpage.patch +0012_smbldap-tools-net-command-name.patch +0013_qw_warning.patch
signature.asc
Description: Digital signature
