Bug#738460: macchanger: diff for NMU version 1.7.0-1.1

2014-07-29 Thread diocles 
tags 738460 + pending
tags 740947 + pending
thanks

Dear maintainer,

I've prepared an NMU for macchanger (versioned as 1.7.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

This is Theodore Ts'o's diff, with minor corrections to the changelog entry.

Regards,

Tim Retout

diff -Nru macchanger-1.7.0/debian/changelog macchanger-1.7.0/debian/changelog
--- macchanger-1.7.0/debian/changelog   2014-02-01 17:20:44.0 +
+++ macchanger-1.7.0/debian/changelog   2014-07-29 22:49:57.0 +0100
@@ -1,3 +1,13 @@
+macchanger (1.7.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix a grave security bug -- the macchanger program was fundamentally
+not working correctly due to a bug in the debian local patch
+08-fix_random_MAC_choice.patch.   In fact, it was **breaking** the
+random MAC choice!?! (Closes: #738460, #740947)
+
+ -- Theodore Y. Ts'o   Sun, 06 Jul 2014 20:32:38 -0400
+
 macchanger (1.7.0-1) unstable; urgency=medium
 
   * New upstream release (Closes: #718849)
diff -Nru macchanger-1.7.0/debian/patches/08-fix_random_MAC_choice.patch 
macchanger-1.7.0/debian/patches/08-fix_random_MAC_choice.patch
--- macchanger-1.7.0/debian/patches/08-fix_random_MAC_choice.patch  
2014-02-01 17:20:44.0 +
+++ macchanger-1.7.0/debian/patches/08-fix_random_MAC_choice.patch  
2014-07-29 22:49:36.0 +0100
@@ -12,6 +12,8 @@
  src/main.c |1 +
  2 files changed, 34 insertions(+), 19 deletions(-)
 
+Index: macchanger/src/mac.c
+===
 --- macchanger.orig/src/mac.c
 +++ macchanger/src/mac.c
 @@ -41,6 +41,13 @@ mc_mac_dup (const mac_t *mac)
@@ -28,7 +30,7 @@
  
  void
  mc_mac_free (mac_t *mac)
-@@ -68,27 +75,34 @@ mc_mac_random (mac_t *mac, unsigned char
+@@ -68,27 +75,32 @@ mc_mac_random (mac_t *mac, unsigned char
 * x1:, x3:, x5:, x7:, x9:, xB:, xD: and xF:
 */
  
@@ -36,9 +38,25 @@
 -  case 6:
 -  /* 8th bit: Unicast / Multicast address
 -   * 7th bit: BIA (burned-in-address) / locally-administered
-+  mac_t newmac;
-+  mc_mac_copy(mac, &newmac);
-+
+-   */
+-  mac->byte[0] = (random()%255) & 0xFC;
+-  mac->byte[1] = random()%255;
+-  mac->byte[2] = random()%255;
+-  case 3:
+-  mac->byte[3] = random()%255;
+-  mac->byte[4] = random()%255;
+-  mac->byte[5] = random()%255;
+-  }
++  mac_t origmac;
++  mc_mac_copy(mac, &origmac);
+ 
+-  /* Handle the burned-in-address bit
+-   */
+-  if (set_bia) {
+-  mac->byte[0] &= ~2;
+-  } else {
+-  mac->byte[0] |= 2;
+-  }
 +  do {
 +  switch (last_n_bytes) {
 +  case 6:
@@ -55,33 +73,18 @@
 +  }
 +
 +  /* Handle the burned-in-address bit
-*/
--  mac->byte[0] = (random()%255) & 0xFC;
--  mac->byte[1] = random()%255;
--  mac->byte[2] = random()%255;
--  case 3:
--  mac->byte[3] = random()%255;
--  mac->byte[4] = random()%255;
--  mac->byte[5] = random()%255;
--  }
++   */
 +  if (set_bia) {
 +  mac->byte[0] &= ~2;
 +  } else {
 +  mac->byte[0] |= 2;
 +  }
-+  } while (mc_mac_equal (&newmac, mac));
- 
--  /* Handle the burned-in-address bit
--   */
--  if (set_bia) {
--  mac->byte[0] &= ~2;
--  } else {
--  mac->byte[0] |= 2;
--  }
-+  mc_mac_copy(&newmac, mac);
++  } while (mc_mac_equal (&origmac, mac));
  }
  
  
+Index: macchanger/src/main.c
+===
 --- macchanger.orig/src/main.c
 +++ macchanger/src/main.c
 @@ -274,6 +274,7 @@ main (int argc, char *argv[])


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636896: z88dk: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: z88dk
Version: 1.8.ds1-8
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects z88dk too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636895: zmakebas: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: zmakebas
Version: 1.2-1
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects zmakebas too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636894: systune: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: systune
Version: 0.5.6-0.1
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects systune too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636893: libapache2-mod-rpaf: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: libapache2-mod-rpaf
Version: 0.5-3
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects libapache2-mod-rpaf too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636892: xfonts-biznet: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: xfonts-biznet
Version: 3.0.0-21
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects xfonts-biznet too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636891: libnss-db: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: libnss-db
Version: 2.2.3pre1-3.2
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects libnss-db too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636890: libapache2-mod-auth-pam: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: libapache2-mod-auth-pam
Version: 1.1.1-8
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects libapache2-mod-auth-pam too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636889: libapache2-mod-auth-plain: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: libapache2-mod-auth-plain
Version: 2.0.50
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects libapache2-mod-auth-plain too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636888: ldapdns: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: ldapdns
Version: 2.06-3.4
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects ldapdns too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636887: henplus: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: henplus
Version: 0.9.7.ds1-2
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects henplus too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636886: aylet: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: aylet
Version: 0.5-2
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects aylet too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636885: gramofile: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: gramofile
Version: 1.6-8
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects gramofile too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636884: cvssuck: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: cvssuck
Version: 0.3.cvs20060124-1
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects cvssuck too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#636883: cvsconnect: yada modifies build-dependencies when rebuilding

2011-08-06 Thread diocles 
Source: cvsconnect
Version: 0.1.cvs20001202-1
Severity: serious
User: dioc...@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects cvsconnect too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout  



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#410130: cryptonit: diff for NMU version 0.9.7-2.4

2010-10-19 Thread diocles 
tags 410130 + pending
thanks

Dear maintainer,

I've prepared an NMU for cryptonit (versioned as 0.9.7-2.4) containing
the patch from Stefano Rivera, and uploaded it to DELAYED/2 as
suggested by section 5.11.1 of the Developer's Reference.  Please feel
free to tell me if I should delay it longer.

I've omitted from this debdiff the updates to config.sub and
config.guess that was made automatically in the clean rule.

Regards,

diff -u cryptonit-0.9.7/debian/changelog cryptonit-0.9.7/debian/changelog
--- cryptonit-0.9.7/debian/changelog
+++ cryptonit-0.9.7/debian/changelog
@@ -1,3 +1,11 @@
+cryptonit (0.9.7-2.4) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * src/ConfigDatabase.cpp: Apply patch from Stefano Rivera to fix
+GUI start on amd64. (Closes: #410130)
+
+ -- Tim Retout   Wed, 20 Oct 2010 01:15:10 +0100
+
 cryptonit (0.9.7-2.3) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- cryptonit-0.9.7.orig/src/ConfigDatabase.cpp
+++ cryptonit-0.9.7/src/ConfigDatabase.cpp
@@ -270,7 +270,7 @@
 
 // Strip the "config://" part if presents.
 std::string params( uri );
-unsigned int i = params.find("config://");
+std::string::size_type i = params.find("config://");
 if( i != std::string::npos)
params.erase(i, strlen("config://") );
 



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#598619: x11vnc: diff for NMU version 0.9.10-1.1

2010-10-18 Thread diocles 
tags 598619 + patch
tags 598619 + pending
thanks

Dear maintainer,

Here's my second attempt.  This certainly has been an educational
experience. :)

I have uploaded it to DELAYED/2 again.

Tim

diff -Nru x11vnc-0.9.10/debian/changelog x11vnc-0.9.10/debian/changelog
--- x11vnc-0.9.10/debian/changelog  2010-06-14 11:28:54.0 +0100
+++ x11vnc-0.9.10/debian/changelog  2010-10-19 00:02:12.0 +0100
@@ -1,3 +1,12 @@
+x11vnc (0.9.10-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: B-D-I on openjdk-6-jdk rather than B-D on default-jdk.
+  * debian/rules: Only rebuild jars in binary and binary-indep targets.
+(Closes: #598619)
+
+ -- Tim Retout   Mon, 18 Oct 2010 23:53:56 +0100
+
 x11vnc (0.9.10-1) unstable; urgency=low
 
   * New upstream release:
diff -Nru x11vnc-0.9.10/debian/control x11vnc-0.9.10/debian/control
--- x11vnc-0.9.10/debian/control2010-06-14 10:36:06.0 +0100
+++ x11vnc-0.9.10/debian/control2010-10-19 00:02:17.0 +0100
@@ -2,10 +2,11 @@
 Section: x11
 Priority: optional
 Maintainer: Fathi Boudra 
-Build-Depends: debhelper (>= 7.4.15), chrpath, automake, libtool, default-jdk,
+Build-Depends: debhelper (>= 7.4.15), chrpath, automake, libtool,
  libavahi-client-dev, libssl-dev, libvncserver-dev (>= 0.9.7),
  libxdamage-dev, libxext-dev, libxfixes-dev, libxinerama-dev, libxrandr-dev,
  libxss-dev, libxtst-dev
+Build-Depends-Indep: openjdk-6-jdk
 Standards-Version: 3.8.4
 Homepage: http://www.karlrunge.com/x11vnc/
 
diff -Nru x11vnc-0.9.10/debian/rules x11vnc-0.9.10/debian/rules
--- x11vnc-0.9.10/debian/rules  2010-06-14 11:21:04.0 +0100
+++ x11vnc-0.9.10/debian/rules  2010-10-19 00:02:07.0 +0100
@@ -3,19 +3,23 @@
 %:
dh $@ --parallel --list-missing
 
+binary binary-indep:
+   dh $@ --parallel --list-missing --until dh_auto_install
+   $(MAKE) -C classes/ssl/src update_jars
+   $(MAKE) -C classes/ssl/src clean
+   dh_auto_install -- -C classes
+   dh $@ --parallel --list-missing --remaining
+
 override_dh_auto_configure:
aclocal
autoheader
automake --add-missing --copy
autoconf
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq ($(DEB_HOST_ARCH),hppa)
-   $(MAKE) -C classes/ssl/src update_jars
-   $(MAKE) -C classes/ssl/src clean
-  endif
-endif
dh_auto_configure -- --with-system-libvncserver
 
+override_dh_auto_build:
+   dh_auto_build -- -C x11vnc
+
 override_dh_auto_clean:
dh_auto_clean
rm -rf autom4te.cache
@@ -23,14 +27,10 @@
depcomp install-sh missing \
rfbconfig.h.in rfb/rfbconfig.h rfb/rfbint.h
find . -type f -name Makefile.in -delete
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq ($(DEB_HOST_ARCH),hppa)
find . -type f -name '*.jar' -delete
-  endif
-endif
 
 override_dh_auto_install:
-   dh_auto_install
+   dh_auto_install -- -C x11vnc
find debian -type f -name 'x11vnc' | xargs chrpath -d
 
 .PHONY: override_dh_auto_test



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#598619: x11vnc: diff for NMU version 0.9.10-1.1

2010-10-17 Thread diocles 
tags 598619 + patch
tags 598619 + pending
thanks

Dear maintainer,

I've prepared an NMU for x11vnc (versioned as 0.9.10-1.1) and
uploaded it to DELAYED/2, as suggested in section 5.11.1 of the
Developer's Reference. Please feel free to tell me if I should
delay it longer.

This will now only rebuild the jars when x11vnc-data is being
built, so the buildds will not require openjdk-6.

Regards,

diff -Nru x11vnc-0.9.10/debian/changelog x11vnc-0.9.10/debian/changelog
--- x11vnc-0.9.10/debian/changelog  2010-06-14 11:28:54.0 +0100
+++ x11vnc-0.9.10/debian/changelog  2010-10-17 23:52:19.0 +0100
@@ -1,3 +1,12 @@
+x11vnc (0.9.10-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: B-D-I on openjdk-6-jdk rather than B-D on default-jdk.
+  * debian/rules: Rebuild jars only when building x11vnc-data rather than
+trying to exclude particular arches. (Closes: #598619)
+
+ -- Tim Retout   Sun, 17 Oct 2010 23:28:38 +0100
+
 x11vnc (0.9.10-1) unstable; urgency=low
 
   * New upstream release:
diff -Nru x11vnc-0.9.10/debian/control x11vnc-0.9.10/debian/control
--- x11vnc-0.9.10/debian/control2010-06-14 10:36:06.0 +0100
+++ x11vnc-0.9.10/debian/control2010-10-17 22:49:39.0 +0100
@@ -2,10 +2,11 @@
 Section: x11
 Priority: optional
 Maintainer: Fathi Boudra 
-Build-Depends: debhelper (>= 7.4.15), chrpath, automake, libtool, default-jdk,
+Build-Depends: debhelper (>= 7.4.15), chrpath, automake, libtool,
  libavahi-client-dev, libssl-dev, libvncserver-dev (>= 0.9.7),
  libxdamage-dev, libxext-dev, libxfixes-dev, libxinerama-dev, libxrandr-dev,
  libxss-dev, libxtst-dev
+Build-Depends-Indep: openjdk-6-jdk
 Standards-Version: 3.8.4
 Homepage: http://www.karlrunge.com/x11vnc/
 
diff -Nru x11vnc-0.9.10/debian/rules x11vnc-0.9.10/debian/rules
--- x11vnc-0.9.10/debian/rules  2010-06-14 11:21:04.0 +0100
+++ x11vnc-0.9.10/debian/rules  2010-10-17 23:18:02.0 +0100
@@ -8,11 +8,9 @@
autoheader
automake --add-missing --copy
autoconf
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifneq ($(DEB_HOST_ARCH),hppa)
+ifneq (,$(findstring x11vnc-data, $(shell dh_listpackages)))
$(MAKE) -C classes/ssl/src update_jars
$(MAKE) -C classes/ssl/src clean
-  endif
 endif
dh_auto_configure -- --with-system-libvncserver
 



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#582998: pidgin-sipe: diff for NMU version 1.9.0-1.1

2010-10-16 Thread diocles 
tags 582998 + pending
thanks

Dear maintainer,

I've prepared an NMU for pidgin-sipe (versioned as 1.9.0-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u pidgin-sipe-1.9.0/debian/changelog pidgin-sipe-1.9.0/debian/changelog
--- pidgin-sipe-1.9.0/debian/changelog
+++ pidgin-sipe-1.9.0/debian/changelog
@@ -1,3 +1,11 @@
+pidgin-sipe (1.9.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * src/core/sipe.c: Apply patch from Ubuntu to fix FTBFS.
+(Closes: #582998)
+
+ -- Tim Retout   Sat, 16 Oct 2010 14:23:16 +0100
+
 pidgin-sipe (1.9.0-1) unstable; urgency=low
 
   * New upstream version (Closes: #570735)
only in patch2:
unchanged:
--- pidgin-sipe-1.9.0.orig/src/core/sipe.c
+++ pidgin-sipe-1.9.0/src/core/sipe.c
@@ -10045,6 +10045,11 @@
 #if PURPLE_VERSION_CHECK(2,6,0)
NULL,   /* initiate_media */
NULL,   /* get_media_caps */
+#if PURPLE_VERSION_CHECK(2,7,0)
+   NULL,   /* get_moods */
+   NULL,   /* initiate_media */
+   NULL,   /* get_media_caps */
+#endif
 #endif
 #endif
 };



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#583371: nut: diff for NMU version 2.4.3-1.1

2010-10-15 Thread diocles 
tags 583371 + patch
tags 583371 + pending
thanks

Dear maintainer,

I've prepared an NMU for nut (versioned as 2.4.3-1.1) and
uploaded it to DELAYED/2, as suggested by section 5.11.1 of the
Developer's Reference. Please feel free to tell me if I
should delay it longer.

This applies the same patch from upstream/Ubuntu.

Regards,

Tim Retout

diff -u nut-2.4.3/debian/changelog nut-2.4.3/debian/changelog
--- nut-2.4.3/debian/changelog
+++ nut-2.4.3/debian/changelog
@@ -1,3 +1,11 @@
+nut (2.4.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * drivers/libhid.c: Apply r2407 from upstream to fix bug with some
+low speed UPS devices. (Closes: #583371)
+
+ -- Tim Retout   Fri, 15 Oct 2010 19:31:39 +0100
+
 nut (2.4.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #544390, #528222, #539747, #526811,
only in patch2:
unchanged:
--- nut-2.4.3.orig/drivers/libhid.c
+++ nut-2.4.3/drivers/libhid.c
@@ -141,7 +141,7 @@
 {
int id = pData->ReportID;
int r;
-   unsigned char   buf[SMALLBUF];
+   unsigned char   buf[8];
 
if (rbuf->ts[id] + age > time(NULL)) {
/* buffered report is still good; nothing to do */
@@ -469,7 +469,7 @@
  */
 int HIDGetEvents(hid_dev_handle_t udev, HIDData_t **event, int eventsize)
 {
-   unsigned char   buf[SMALLBUF];
+   unsigned char   buf[8];
int itemCount = 0;
int buflen, r, i;
HIDData_t   *pData;



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#570719: librep: diff for NMU version 0.90.2-1.1

2010-10-14 Thread diocles 
tags 570719 + patch
tags 570719 + pending
thanks

Dear maintainer,

I've prepared an NMU for librep (versioned as 0.90.2-1.1) and
uploaded it to DELAYED/5, as suggested by section 5.11.1 of the
Developer's Reference for NMUs fixing RC bugs less than 7 days old.
Please feel free to tell me if I should delay it longer.

Regards.
diff -u librep-0.90.2/debian/changelog librep-0.90.2/debian/changelog
--- librep-0.90.2/debian/changelog
+++ librep-0.90.2/debian/changelog
@@ -1,3 +1,12 @@
+librep (0.90.2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules: Set CONFIG_SHELL and run ./configure using /bin/bash
+explicitly, so that the generated libtool will work with any /bin/sh.
+(Closes: #570719)
+
+ -- Tim Retout   Thu, 14 Oct 2010 18:51:17 +0100
+
 librep (0.90.2-1) unstable; urgency=low
 
   * New Upstream Release.
diff -u librep-0.90.2/debian/rules librep-0.90.2/debian/rules
--- librep-0.90.2/debian/rules
+++ librep-0.90.2/debian/rules
@@ -48,7 +48,8 @@
cp /usr/share/misc/config.guess .
cp /usr/share/misc/config.sub .
 
-   ./configure --prefix=/usr --libexecdir=/usr/lib --mandir=/usr/share/man 
\
+   CONFIG_SHELL=/bin/bash /bin/bash ./configure \
+   --prefix=/usr --libexecdir=/usr/lib --mandir=/usr/share/man \
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
--with-readline CFLAGS="$(CFLAGS)" $(ARCH_CONF)
 



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#521857: ettercap: diff for NMU version 1:0.7.3-2.1

2010-10-07 Thread diocles 
tags 521857 + pending
thanks

Dear maintainer,

I've prepared an NMU for ettercap (versioned as 1:0.7.3-2.1) and
uploaded it to DELAYED/2, as suggested by section 5.11.1 of the
Developers' Reference. Please feel free to tell me if I should delay
it longer.

This applies a fix to the 01_pointers_and_ints_dont_mix.diff patch.

Regards.

diff -u ettercap-0.7.3/debian/changelog ettercap-0.7.3/debian/changelog
--- ettercap-0.7.3/debian/changelog
+++ ettercap-0.7.3/debian/changelog
@@ -1,3 +1,12 @@
+ettercap (1:0.7.3-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * 01_pointers_and_ints_dont_mix.diff: Cast to u_char* rather than
+simply removing the cast.  Updated patch by Robert Edmonds.
+(Closes: #521857)
+
+ -- Tim Retout   Thu, 07 Oct 2010 20:34:05 +0100
+
 ettercap (1:0.7.3-2) unstable; urgency=low
 
   * Ettercap can see wifi traffics with new libpcap (Closes: #385746).
diff -u ettercap-0.7.3/debian/patches/01_pointers_and_ints_dont_mix.diff 
ettercap-0.7.3/debian/patches/01_pointers_and_ints_dont_mix.diff
--- ettercap-0.7.3/debian/patches/01_pointers_and_ints_dont_mix.diff
+++ ettercap-0.7.3/debian/patches/01_pointers_and_ints_dont_mix.diff
@@ -1,4 +1,5 @@
-See debian bug #521857, patch from Timothy Redaelli 
+See debian bug #521857, patch from Timothy Redaelli
+Revised by Robert Edmonds 
 
 --- ettercap-0.7.3.orig/src/protocols/ec_tcp.c
 +++ ettercap-0.7.3/src/protocols/ec_tcp.c
@@ -8,5 +9,5 @@
 opt_start = (u_char *)(tcp + 1);
 -   opt_end = (u_char *)((int)tcp + tcp->off * 4);
-+   opt_end = (u_char *)(tcp + tcp->off * 4);
++   opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4);
  
 DECODED_LEN = (u_int32)(tcp->off * 4);



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#591547: pkg-config: diff for NMU version 0.25-1.1

2010-10-03 Thread diocles 
tags 591547 + pending
thanks

Dear Tollef,

I've prepared an NMU for pkg-config (versioned as 0.25-1.1) and
uploaded it to DELAYED/2, as suggested in section 5.11.1 of the
Developer's Reference.  Please feel free to tell me if I should delay
it longer.

I took the commit you mentioned in the upstream bug report, and tested
it against a version of autoconf without Debian's workaround (bug
#591548).  It does indeed seem to fix the problem.

Regards,

diff -u pkg-config-0.25/debian/changelog pkg-config-0.25/debian/changelog
--- pkg-config-0.25/debian/changelog
+++ pkg-config-0.25/debian/changelog
@@ -1,3 +1,11 @@
+pkg-config (0.25-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * pkg.m4: Apply commit 2b86e9b from upstream, to fix compatibility with
+autoconf (>= 2.66). (Closes: #591547)
+
+ -- Tim Retout   Sun, 03 Oct 2010 17:13:29 +0100
+
 pkg-config (0.25-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- pkg-config-0.25.orig/pkg.m4
+++ pkg-config-0.25/pkg.m4
@@ -135,7 +135,7 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])dnl
+_PKG_TEXT])[]dnl
 ])
 elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@@ -146,7 +146,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see .])dnl
+To get pkg-config, see .])[]dnl
 ])
 else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#585614: mp3splt-gtk: diff for NMU version 0.5.6-1.2

2010-10-03 Thread diocles 
tags 585614 + patch
tags 585614 + pending
thanks

Dear maintainer,

I've prepared an NMU for mp3splt-gtk (versioned as 0.5.6-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -u mp3splt-gtk-0.5.6/debian/control mp3splt-gtk-0.5.6/debian/control
--- mp3splt-gtk-0.5.6/debian/control
+++ mp3splt-gtk-0.5.6/debian/control
@@ -12,6 +12,7 @@
 Package: mp3splt-gtk
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmp3splt-mp3 | libmp3splt-plugin
+Recommends: gstreamer0.10-plugins-good
 Suggests: audacious
 Description: GTK interface to split MP3 and Ogg Vorbis files without reencoding
  Mp3Splt-project is a utility to split mp3 and ogg files selecting a
diff -u mp3splt-gtk-0.5.6/debian/changelog mp3splt-gtk-0.5.6/debian/changelog
--- mp3splt-gtk-0.5.6/debian/changelog
+++ mp3splt-gtk-0.5.6/debian/changelog
@@ -1,3 +1,11 @@
+mp3splt-gtk (0.5.6-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: Add Recommends on gstreamer0.10-plugins-good.
+(Closes: #585614)
+
+ -- Tim Retout   Sun, 03 Oct 2010 12:46:50 +0100
+
 mp3splt-gtk (0.5.6-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.



-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org