2.4.6 and /usr/sbin/cyrus
Ondřej Surý
ondrej at sury.org
Tue Dec 21 09:34:02 UTC 2010
Fixed. Thanks. I'm going to build it now, so I catch more possible
brown paper bugs like this.
O.
On Tue, Dec 21, 2010 at 10:29, Thomas Cataldo <tcataldo at gmail.com> wrote:
>
>
> On Tue, Dec 21, 2010 at 10:22 AM, Ondřej Surý <ondrej at sury.org> wrote:
>>
>> Anthony,
>>
>> thanks for quick fix. I have pulled your changes. I think you are free
>> to commit fixes directly in our debian repository if you want.
>>
>> I have pushed some more changes:
>>
>
>
> Not ok :-)
> cp: cannot stat `debian/tmp/usr/lib/cyrus/bin/deliver': No such file or
> directory
> dh_install: cp -a debian/tmp/usr/lib/cyrus/bin/deliver
> debian/cyrus-common-2.4//usr/lib/cyrus/bin/ returned exit code 1
> make: *** [binary] Error 2
> dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit
> status 2
>
>
>>
>> ec9106b WS fixes in cyrus-common-2.4.postinst
>> bdce33d Fix cyrus-makedirs by installing it as
>> /usr/lib/cyrus/bin/makedirs and fix /usr/bin/cyrus accordingly
>> d45f7f4 Remove master and deliver from /usr/sbin/cyrus tool
>> 4809052 Revert "Fix PID file name"
>> a6277a6 Revert changes to master and deliver, keep them as cyrmaster
>> and cyrdeliver.
>> b8bca9d Add support for sourcing /etc/default/cyrus-imapd to get CONF
>> value
>> 0888b46 WS fix in debian/cyrus
>>
>> I have reverted the changes to master and deliver binaries. They are
>> called independently (master is a master process and deliver is called
>> from MTA), so I don't think there is a need for unification inside the
>> master-tool.
>>
>> Also Anthony, I have noticed that you use four spaces instead of TAB.
>> Please try to keep the WS same with the rest of team, since it creates
>> mess. Quick peak with some editor or viewer which has TAB width set to
>> 8 will reveal that.
>>
>> Thanks,
>> Ondrej
>>
>> On Tue, Dec 21, 2010 at 01:31, Anthony Prades <toony.debian at chezouam.net>
>> wrote:
>> > On 12/20/2010 10:34 PM, Thomas Cataldo wrote:
>> >>
>> >>
>> >> On Mon, Dec 20, 2010 at 5:52 PM, Ondřej Surý <ondrej at sury.org
>> >> <mailto:ondrej at sury.org>> wrote:
>> >>
>> >> Hi all,
>> >>
>> >> I have pushed my repository to alioth which introduces two major
>> >> changes:
>> >>
>> >> - Introduction of versionless virtual packages (ie. cyrus-imapd
>> >> depending on cyrus-imapd-2.4, etc.)
>> >>
>> >> - New /usr/sbin/cyrus tool (which is just crude shell script right
>> >> now) which "knows" all the cyrus commands located in
>> >> /usr/lib/cyrus/bin/*
>> >>
>> >> I have tried to preserve backwards compatibility (installing
>> >> symlinks
>> >> everywhere) with our old cyrus-imapd-2.2, but anyway this is a
>> >> change
>> >> which needs to be discussed with upstream. Jeroen, what do you think
>> >> as a release manager? Is the /usr/sbin/cyrus a way which could
>> >> possibly be adopted by upstream? (I was also thinking about calling
>> >> it
>> >> just 'cyr', but there is a name clash with console-cyrilic package
>> >> :-(.)
>> >>
>> >> I tried to follow the git path as much as possible (manpages are
>> >> renamed to cyrus-{something}) and the script tries hard to find the
>> >> relevant command (it automatically prepends cyr_{command} and
>> >> ctl_{command} and knows the check = chk_cyrus). More tweaks can be
>> >> added later (f.e. we can introduce cyrus control {subcommand} to
>> >> call
>> >> /usr/lib/cyrus/bin/ctl_{subcommand}).
>> >>
>> >> Again I have finished this just before my end of worktime, so it
>> >> just
>> >> builds in the pbuilder. Brave hearts are welcomed to test the result
>> >> using git-buildpackage. I do not guarantee anything, it may eat your
>> >> system or your dog :).
>> >>
>> >>
>> >> Found another thing broken in the rules file :
>> >> for i in master reconstruct quota deliver ; do \
>> >> ln -s $(TMPPKG)/usr/sbin/cyrus
>> >> $(TMPPKG)/usr/sbin/cyr$$i ;\
>> >> done
>> >> for i in mbpath ctl_mboxlist ctl_deliver ctl_cyrusdb squatter \
>> >> tls_prune ipurge cyrdump cvt_cyrusdb chk_cyrus
>> >> arbitron \
>> >> cyr_expire unexpunge sync_client sync_reset
>> >> cyr_synclog \
>> >> cyr_dbtool cyr_df cyrus-makedirs ; do \
>> >> ln -s $(TMPPKG)/usr/sbin/cyrus $(TMPPKG)/usr/sbin/$$i
>> >> ;\
>> >> done
>> >>
>> >> This will create broken symlinks with the build path hardcoded in the
>> >> link
>> >> :
>> >>
>> >> # ls -l cyrdeliver
>> >> lrwxrwxrwx 1 root root 82 2010-12-20 20:49 cyrdeliver ->
>> >>
>> >>
>> >> /var/lib/hudson/jobs/cyrus-2.4-debian-officiel/workspace/debian/tmp/usr/sbin/cyrus
>> >>
>> >> For example.
>> >>
>> >
>> > Hi,
>> >
>> > Here is a pull request, including your patch and some fixes:
>> >
>> > The following changes since commit
>> > b49677b1be536d0b97b9f70ed1dee3a1d3511584:
>> >
>> > Buildable snapshot build (2010-12-20 17:45:34 +0100)
>> >
>> > are available in the git repository at:
>> > git at github.com:toony/pkg-cyrus-imapd-2.4-toony.git debian-sid-toony
>> >
>> > Anthony Prades (5):
>> > Fix in packaging by Thomas Cataldo
>> > Fix /usr/sbin/* symlinks creation Fix universal command
>> > interface
>> > call
>> > Add cyrus-makedirs support for 'lock' directory
>> > Add creation of USERDENY database (flat) if doesn't exist
>> > Fix PID file name Fix cyrus-imapd init script to new process
>> > and
>> > pid file names
>> >
>> > debian/cyrus | 4 +++-
>> > debian/cyrus-common-2.4.cyrus-imapd.init | 2 +-
>> > debian/cyrus-common-2.4.postinst | 26
>> > ++++++++++++++++++++++++--
>> > debian/cyrus-makedirs | 4 ++--
>> > debian/rules | 6 +++---
>> > 5 files changed, 33 insertions(+), 9 deletions(-)
>> >
>> > Anthony
>> >
>> >>
>> >>
>> >> _______________________________________________
>> >> Pkg-Cyrus-imapd-Debian-devel mailing list
>> >> Pkg-Cyrus-imapd-Debian-devel at lists.alioth.debian.org
>> >>
>> >>
>> >> http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel
>> >
>> >
>> > _______________________________________________
>> > Pkg-Cyrus-imapd-Debian-devel mailing list
>> > Pkg-Cyrus-imapd-Debian-devel at lists.alioth.debian.org
>> >
>> > http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel
>>
>>
>>
>> --
>> Ondřej Surý <ondrej at sury.org>
>>
>> _______________________________________________
>> Pkg-Cyrus-imapd-Debian-devel mailing list
>> Pkg-Cyrus-imapd-Debian-devel at lists.alioth.debian.org
>>
>> http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel
>
> _______________________________________________
> Pkg-Cyrus-imapd-Debian-devel mailing list
> Pkg-Cyrus-imapd-Debian-devel at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-cyrus-imapd-debian-devel
>
--
Ondřej Surý <ondrej at sury.org>
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list