Bug#346359: dosemu-freedos: newer upstream stable

2006-01-07 Thread Bart Martens
Package: dosemu-freedos
Version: b8p-4
Severity: wishlist

The newest upstream stable is currently version b9r5.
http://dosemu.sourceforge.net/stable/




-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#346363: dosemu-freedos: .orig.tar.gz differs from upstream files without explanation

2006-01-07 Thread Bart Martens
Package: dosemu-freedos
Version: b8p-4

The packaged .orig.tar.gz differs from the upstream files.  See the
attached log.txt for details.  The differences may be necessary, but
they are not explained in debian/changelog or in debian/README.Debian.

[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ md5sum *
3522d2c139c2fd30d333d93570274377  dosemu-freedos-b8p-bin.tgz
b2600e00e73d24f563b153f4b514122a  dosemu-freedos_b8p.orig.tar.gz
e84c91574c8d1c8b2e95c154d37e472a  dosemu-freedos-b8p-sources.tgz
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ tar xzf 
dosemu-freedos_b8p.orig.tar.gz
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ tar xzf 
dosemu-freedos-b8p-sources.tgz
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ ls -al
total 4860
drwxr-xr-x  4 bart bart4096 2006-01-07 11:00 .
drwxr-xr-x  4 bart bart4096 2006-01-07 10:36 ..
drwxr-xr-x  3 bart bart4096 2006-01-07 11:00 dosemu-freedos
-rw-r--r--  1 bart bart  794880 2006-01-07 10:43 dosemu-freedos-b8p-bin.tgz
drwx--  4 bart bart4096 2003-01-31 23:28 dosemu-freedos-b8p.orig
-rw-r--r--  1 bart bart 2462560 2006-01-07 10:36 dosemu-freedos_b8p.orig.tar.gz
-rw-r--r--  1 bart bart 1679744 2006-01-07 10:37 dosemu-freedos-b8p-sources.tgz
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ diff -ru dosemu-freedos-b8p.orig 
dosemu-freedos
Only in dosemu-freedos-b8p.orig: FDchange.log
Only in dosemu-freedos-b8p.orig: freedos
Only in dosemu-freedos-b8p.orig: README.bindist
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ tar xzf 
dosemu-freedos-b8p-bin.tgz
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ ls -al
total 4864
drwxr-xr-x  5 bart bart4096 2006-01-07 11:01 .
drwxr-xr-x  4 bart bart4096 2006-01-07 10:36 ..
drwxr-xr-x  3 bart bart4096 2002-12-20 21:55 dosemu
drwxr-xr-x  3 bart bart4096 2006-01-07 11:00 dosemu-freedos
-rw-r--r--  1 bart bart  794880 2006-01-07 10:43 dosemu-freedos-b8p-bin.tgz
drwx--  4 bart bart4096 2003-01-31 23:28 dosemu-freedos-b8p.orig
-rw-r--r--  1 bart bart 2462560 2006-01-07 10:36 dosemu-freedos_b8p.orig.tar.gz
-rw-r--r--  1 bart bart 1679744 2006-01-07 10:37 dosemu-freedos-b8p-sources.tgz
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ ls -al dosemu
total 20
drwxr-xr-x  3 bart bart 4096 2002-12-20 21:55 .
drwxr-xr-x  5 bart bart 4096 2006-01-07 11:01 ..
-rw-r--r--  1 bart bart  465 2002-12-20 22:15 FDchange.log
drwxr-xr-x  9 bart bart 4096 2002-12-20 21:55 freedos
-rw-r--r--  1 bart bart 3012 2002-12-20 22:18 README.bindist
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ mv dosemu/* dosemu-freedos
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$ diff -ru dosemu-freedos-b8p.orig 
dosemu-freedos
Only in dosemu-freedos/freedos/bin: command.com
Only in dosemu-freedos/freedos/bin: join.exe
Only in dosemu-freedos/freedos/bin: subst.exe
Only in dosemu-freedos/freedos: command.com
Only in dosemu-freedos/freedos/doc/attrib: copying
Only in dosemu-freedos/freedos/doc/bwbasic: copying
Only in dosemu-freedos/freedos/doc/choice: copying
Only in dosemu-freedos/freedos/doc/deltree: copying
Only in dosemu-freedos/freedos/doc/diskcopy: copying
Only in dosemu-freedos/freedos/doc/edit: license.txt
Only in dosemu-freedos/freedos/doc/help: copying
Only in dosemu-freedos/freedos/doc/mem: copying
Only in dosemu-freedos/freedos/doc/more: copying
Only in dosemu-freedos/freedos/doc/nansi: license.txt
Only in dosemu-freedos/freedos/doc/pause: copying
Only in dosemu-freedos/freedos/doc/replace: copying
Only in dosemu-freedos/freedos/doc/tree: copying
Only in dosemu-freedos/freedos/doc/vol: license.txt
Only in dosemu-freedos/freedos/doc/xcopy: copying
Only in dosemu-freedos/freedos: dosemu
[EMAIL PROTECTED]:~/src/dosemu-freedos/unpack$



Bug#346385: [NONFREE-DOC] man pppoeconf under the GFDL

2006-01-07 Thread Filipus Klutiero
Package: pppoeconf
Version: 1.8
Severity: serious
Justification: Policy 2.2.1

The copyright file mentions only the GPL, but the manpage seems to
contradict this.
Since Eduard wrote this, relicensing shouldn't be too problematic
:)

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-1-386
Locale: LANG=fr_CA.UTF-8, LC_CTYPE=fr_CA.UTF-8 (charmap=UTF-8)

Versions of packages pppoeconf depends on:
ii  gettext-base  0.14.5-2   GNU Internationalization utilities
ii  ppp   2.4.4b1-1  Point-to-Point Protocol (PPP) daem
ii  sed   4.1.2-8The GNU sed stream editor
ii  whiptail [whiptail-provider]  0.51.6-31  Displays user-friendly dialog boxe

Versions of packages pppoeconf recommends:
ii  locales   2.3.5-8GNU C Library: National Language (

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#334361: pppoeconf: Explanation, patch

2006-01-07 Thread Filipus Klutiero
Package: pppoeconf
Version: 1.8
Followup-For: Bug #334361

First I'll clarify what David Fasani meant. By "erase the old "auto"
variable values", he thinks that auto is a variable and that the added
line #20 changes its value. Actually, #20 just declares new auto
interfaces, but since eth0 is already declared, the new interfaces file
is invalid. /etc/init.d/networking start fails and this explains why he
has to do stuff manually each time.

The cause of this breakage is either a broken regex introduced in 1.8
which greps for a literal "+", or the fact that the greps don't expect
auto lines to declare as auto several interfaces. Attached
pppoeconf_regex.patch fixes both problems in the two first lines. The
last line is a cosmetic fix.

Since pppoeconf isn't particularly robust, I've also attached
pppoeconf_1.8+regexfix_robustinterfaces.patch which attempts to make
sure that the generated interfaces is valid.
There are 2 reasons I created the last patch: in case a new similar bug
is introduced, and to learn sh scripting. Seriously, you should really
review the patch, I'm not assuming full responsability if it breaks
something.

Since this can break network and potentially let lo unconfigured, please 
consider bumping this to serious...or fixing soon ;)

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-1-386
Locale: LANG=fr_CA.UTF-8, LC_CTYPE=fr_CA.UTF-8 (charmap=UTF-8)

Versions of packages pppoeconf depends on:
ii  gettext-base  0.14.5-2   GNU Internationalization utilities
ii  ppp   2.4.4b1-1  Point-to-Point Protocol (PPP) daem
ii  sed   4.1.2-8The GNU sed stream editor
ii  whiptail [whiptail-provider]  0.51.6-31  Displays user-friendly dialog boxe

Versions of packages pppoeconf recommends:
ii  locales   2.3.5-8GNU C Library: National Language (

-- no debconf information
243c243
<   if ! grep -q "^auto\ +$iface" $INTFILE ; then
---
>   if ! grep -q "^[[:space:]]*auto[[:space:]][^#]*$iface" $INTFILE ; then
248c248
<   if ! grep -q "^\ *iface\ +$iface" $INTFILE ; then
---
>   if ! grep -q "^[[:space:]]*iface[[:space:]]\+$iface" $INTFILE ; then
250c250
<   echo "iface $iface inet manual" >> $INTFILE
---
>   echo "iface $iface inet manual" >> $INTFILE
--- /root/pppoeconf.prerobust   2006-01-06 15:34:42.0 -0500
+++ pppoeconf   2006-01-07 08:53:15.0 -0500
@@ -7,7 +7,7 @@
 export TEXTDOMAINDIR="/usr/share/locale"
 export TEXTDOMAIN=pppoeconf
 export OPTSFILE="/etc/ppp/peers/dsl-provider"
-export INTFILE="/etc/network/interfaces"
+export REALINTFILE="/etc/network/interfaces"
 
 # IMPORTANT: Do not use gdialog unless it has been fixed!
 DIALOG=whiptail
@@ -77,23 +77,6 @@
 chmod 0640 $OPTSFILE
 chown root:dip $OPTSFILE
 
-if ! grep -q "dsl-provider" $INTFILE ; then
-   printf '\niface dsl-provider inet ppp\nprovider dsl-provider\n' >> $INTFILE
-fi
-
-# old crap, unreliable, does not work after reboot
-# if ! grep -q "line maintained by pppoeconf" $INTFILE ; then
-#sed -i -e 's,provider dsl-provider$, provider dsl-provider\n# please 
do not modify the following line\n pre-up /sbin/ifconfig eth0 up # line 
maintained by pppoeconf\n,' $INTFILE
-# fi
-   
-umask 177
-# make a secure directory
-TMP="`mktemp -d -p /etc/ppp`"
-export TMP
-sectempfile="`mktemp -p $TMP`"
-export sectempfile
-trap "rm -rf '$TMP'" 0 HUP INT TRAP TERM
-
 gettext '
 Most providers send the needed login information per mail. Some providers 
describe it in odd ways, assuming the user to input the data in their 
"user-friendly" setup programs. But in fact, these applications generate usuall 
PPP user names and passwords from the entered data. You can find the real names 
too and input the correct data in the dialog box.
 
@@ -183,6 +166,23 @@
   exit 1
   ;;
esac
+
+   INTFILE="`mktemp -t interfaces.pppoeconf.XX`" || exit 1
+   export INTFILE
+   cp $REALINTFILE $INTFILE
+
+   if ! grep -q "dsl-provider" $INTFILE ; then
+  printf '\niface dsl-provider inet ppp\nprovider dsl-provider\n' >> 
$INTFILE
+   fi
+
+   umask 177
+   # make a secure directory
+   TMP="`mktemp -d -p /etc/ppp`"
+   export TMP
+   sectempfile="`mktemp -p $TMP`"
+   export sectempfile
+   trap "rm -rf '$TMP'" 0 HUP INT TRAP TERM
+
# now, execute an AC lookup on each interface
for mmm in '' ' -U ' ; do
   for iface in $list; do
@@ -403,7 +403,24 @@
   
   # end of story
   rm -rf "$TMP"
-  
+  chmod --reference=$REALINTFILE $INTFILE
+  # check that final file is valid or original one was already invalid. 
otherwise ask what to do
+  ifup -nai $INTFILE 2>/dev/null
+  if test "$?" = "1" &&  (ifup -na 2>/dev/null; test "$?" = "0"); then
+title='ERROR'
+text="The interfaces file generated by pppoeconf appears to be invalid. 
This is probably because pp