<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "http://bugs.gentoo.org/bugzilla.dtd">

<bugzilla version="2.22.7"
          urlbase="http://bugs.gentoo.org/"
          maintainer="bugzilla@gentoo.org"
>

    <bug>
          <bug_id>85798</bug_id>
          
          <creation_ts>2005-03-18 09:54 0000</creation_ts>
          <short_desc>zodb-3.3 ebuild is missing a patch</short_desc>
          <delta_ts>2005-04-04 02:40:32 0000</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>Gentoo Linux</product>
          <component>Development</component>
          <version>unspecified</version>
          <rep_platform>All</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          
          <priority>P2</priority>
          <bug_severity>normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          
          <everconfirmed>1</everconfirmed>
          <reporter>zaai@spaaij.net</reporter>
          <assigned_to>net-zope@gentoo.org</assigned_to>
          

      

      
          <long_desc isprivate="0">
            <who>zaai@spaaij.net</who>
            <bug_when>2005-03-18 09:54:56 0000</bug_when>
            <thetext>zodb-3.3.final has a bug in zdctl. As a result, running a zeo server using zdctl will fail because it tries to pass the umask option without a parameter.

The &apos;umask&apos; option is missing a parameter.
Around line 219:
   args += self._get_override(&quot;-m&quot;, &quot;umask&quot;)
Should be:
   args += self._get_override(&quot;-m&quot;, &quot;umask&quot;, oct(self.options.umask))
Or, simply comment it out (is it for 3.2 compatibility only?):
   # args += self._get_override(&quot;-m&quot;, &quot;umask&quot;)

The ZODB wiki has a patch for this, 
http://www.zope.org/Collectors/Zope/1323


Reproducible: Always
Steps to Reproduce:
1. install zodb-3.3
2. run: zdctl.py -p &apos;runzeo.py -f test -a 9999&apos; start
Error: invalid value for -m &apos;18&apos;: invalid literal for int(): 18
For help, use /usr/bin/zdrun.py -h

Actual Results:  
zdctl.py -p &apos;runzeo.py -f test -a 9999&apos; start
Error: invalid value for -m &apos;18&apos;: invalid literal for int(): 18
For help, use /usr/bin/zdrun.py -h


Expected Results:  
It should run the zeo server without error messages.
^C terminates the process</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>radek@gentoo.org</who>
            <bug_when>2005-03-25 16:54:05 0000</bug_when>
            <thetext>Patch commited into portage. this should go upstream, but date on zodb zollecter is almost year old, looks like no one will fix it at their side :(

patch is small, so i decided to put it into tree. This was done _without_ version bump, so please do emerge sync followed by emerge zodb.

thank you for your information.</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>zaai@spaaij.net</who>
            <bug_when>2005-03-27 18:59:55 0000</bug_when>
            <thetext>Just tested the new ebuild and it works fine.
Thanks for fixing this.

Slightly off-topic, but can you please add the ~amd64 keywords to the ebuilds?
ZODB-3.2.5 and ZODB-3.3 both work fine on amd64.
</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>radek@gentoo.org</who>
            <bug_when>2005-03-28 02:03:39 0000</bug_when>
            <thetext>please follow bug http://bugs.gentoo.org/show_bug.cgi?id=86949 i filled for you. As i have access only to x86, i cannot add amd64 keyword. Would be very nice if you can file some bugs for other packages _working_ on your amd64.</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>zaai@spaaij.net</who>
            <bug_when>2005-03-28 11:58:46 0000</bug_when>
            <thetext>Created an attachment (id=54707)
Updated patch with different line numbers

This patch replaces:
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch

Oddly enough the patch works on my amd64 box but not on the x86 box.
For some reason the line numbering of the original patch (posted on the zodb
bug collector) is slightly off. Attached an updated patch. 
Can you please update portage?
Thanks,
Henk</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>radek@gentoo.org</who>
            <bug_when>2005-03-29 13:45:37 0000</bug_when>
            <thetext>this is strange, beacuse i prepared the patch personally (i mean headers) also directoried to match package. also the patch applies cleanly on my x86 (otherwise i would commit it into portage).

Could You please paste error from emerge (especially output file, which is mention on patch applying failure) ?

och, please do &apos;rm -rf /var/tmp/portage/zodb-3.3/&apos; before emerge.

as for now, i did not update patch in portage.</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>zaai@spaaij.net</who>
            <bug_when>2005-03-29 15:51:58 0000</bug_when>
            <thetext>Yeah I was a bit surprised as well, especially since it works fine on my amd64 box. Maybe it has to do with line endings or the patch fuzz factor?
Below the emerge error info. emerge was called after deleting /var/tmp/portage/zodb-3.3/

# emerge  zodb
Calculating dependencies ...done!
&gt;&gt;&gt; emerge (1 of 1) net-zope/zodb-3.3 to /
&gt;&gt;&gt; md5 src_uri ;-) ZODB3-3.3.tgz
&gt;&gt;&gt; Unpacking source...
&gt;&gt;&gt; Unpacking ZODB3-3.3.tgz to /var/tmp/portage/zodb-3.3/work
 * Applying zodb-3.3_umaskbug.patch ...

 * Failed Patch: zodb-3.3_umaskbug.patch !
 *  ( /usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/zodb-3.3/temp/zodb-3.3_umaskbug.patch-5472.out


!!! ERROR: net-zope/zodb-3.3 failed.
!!! Function epatch, Line 401, Exitcode 0
!!! Failed Patch: zodb-3.3_umaskbug.patch!
!!! If you need support, post the topmost build error, NOT this status message.


# cat /var/tmp/portage/zodb-3.3/temp/zodb-3.3_umaskbug.patch-5472.out
***** zodb-3.3_umaskbug.patch *****

===================================

PATCH COMMAND:  patch -p0 -g0 &lt; /usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch

===================================
patching file Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py
Hunk #1 FAILED at 208.
1 out of 1 hunk FAILED -- saving rejects to file Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.rej
===================================

PATCH COMMAND:  patch -p1 -g0 &lt; /usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch

===================================
can&apos;t find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig       2004-05-07 19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py    2004-05-07 19:50:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
===================================

PATCH COMMAND:  patch -p2 -g0 &lt; /usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch

===================================
can&apos;t find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig       2004-05-07 19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py    2004-05-07 19:50:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
===================================

PATCH COMMAND:  patch -p3 -g0 &lt; /usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch

===================================
can&apos;t find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig       2004-05-07 19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py    2004-05-07 19:50:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
===================================

PATCH COMMAND:  patch -p4 -g0 &lt; /usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch

===================================
missing header for unified diff at line 3 of patch
can&apos;t find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.orig       2004-05-07 19:50:30.000000000 -0400
|+++ Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py    2004-05-07 19:50:51.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>radek@gentoo.org</who>
            <bug_when>2005-04-01 04:17:51 0000</bug_when>
            <thetext>could You please send me by email (radek@gentoo.org), three files:
/var/tmp/portage/zodb-3.3/.../Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py.rej
/var/tmp/portage/zodb-3.3/.../Dependencies/zdaemon-ZODB3-3.3/zdaemon/zdctl.py
/usr/portage/net-zope/zodb/files/zodb-3.3_umaskbug.patch

its best to get it just after emerge failure.

also current patch version (-v) if its different than 2.5.9


</thetext>
          </long_desc>
          <long_desc isprivate="0">
            <who>radek@gentoo.org</who>
            <bug_when>2005-04-04 02:40:32 0000</bug_when>
            <thetext>Thanx for Henk Spaaij help i managed to correct patch in the portage. Please do &apos;emerge sync; rm -rf /var/tmp/zodb-3.3; emerge -av =net-zope/zodb-3.3&apos; to emerge newest version (no version bump).</thetext>
          </long_desc>
      
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>54707</attachid>
            <date>2005-03-28 11:58 0000</date>
            <desc>Updated patch with different line numbers</desc>
            <filename>zodb-3.3_umaskbug.patch</filename>
            <type>text/plain</type>
            <data encoding="base64">LS0tIERlcGVuZGVuY2llcy96ZGFlbW9uLVpPREIzLTMuMy96ZGFlbW9uL3pkY3RsLnB5Lm9yaWcJ
MjAwNS0wMy0yOCAxMTozNzo1NS4zMjUwMjA2NDggLTA4MDAKKysrIERlcGVuZGVuY2llcy96ZGFl
bW9uLVpPREIzLTMuMy96ZGFlbW9uL3pkY3RsLnB5CTIwMDUtMDMtMjggMTE6NDU6NDQuMTU2NzQ3
MzkyIC0wODAwCkBAIC0yMTMsNyArMjEzLDcgQEAKICAgICAgICAgICAgIGFyZ3MgKz0gc2VsZi5f
Z2V0X292ZXJyaWRlKCItZiIsICJmb3JldmVyIiwgZmxhZz0xKQogICAgICAgICAgICAgYXJncyAr
PSBzZWxmLl9nZXRfb3ZlcnJpZGUoIi1zIiwgInNvY2tuYW1lIikKICAgICAgICAgICAgIGFyZ3Mg
Kz0gc2VsZi5fZ2V0X292ZXJyaWRlKCItdSIsICJ1c2VyIikKLSAgICAgICAgICAgIGFyZ3MgKz0g
c2VsZi5fZ2V0X292ZXJyaWRlKCItbSIsICJ1bWFzayIpCisgICAgICAgICAgICBhcmdzICs9IHNl
bGYuX2dldF9vdmVycmlkZSgiLW0iLCAidW1hc2siLCBvY3Qoc2VsZi5vcHRpb25zLnVtYXNrKSkK
ICAgICAgICAgICAgIGFyZ3MgKz0gc2VsZi5fZ2V0X292ZXJyaWRlKAogICAgICAgICAgICAgICAg
ICIteCIsICJleGl0Y29kZXMiLCAiLCIuam9pbihtYXAoc3RyLCBzZWxmLm9wdGlvbnMuZXhpdGNv
ZGVzKSkpCiAgICAgICAgICAgICBhcmdzICs9IHNlbGYuX2dldF9vdmVycmlkZSgiLXoiLCAiZGly
ZWN0b3J5IikK
</data>        

          </attachment>
    </bug>

</bugzilla>