Control: tags -1 patch Dear Maintainer,
On Thu, 27 Jul 2017 16:12:13 +0200 Balint Reczey <[email protected]> wrote: ... > Dear Maintainer, > > During test rebuilds for the upcoming libevent transition [1] your package found > to be failing to build [2] with libevent-dev 2.1.8-stable-2 from experimental: > > ... > > cc -c watchcatd.c -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. > -fstack-protector-strong -Wformat -Werror=format-security -O2 -Wall > -pedantic -L/usr/lib -I/usr/include -DWCAT_PREFIX=\"/usr\" > cc utils.o master.o loadconf.o watchcatd.o -levent -o catmaster -g -O2 > -fdebug-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong > -Wformat -Werror=format-security -O2 -Wall -pedantic -L/usr/lib > -I/usr/include -DWCAT_PREFIX=\"/usr\" > cc -c slave.c -g -O2 -fdebug-prefix-map=/<<PKGBUILDDIR>>=. > -fstack-protector-strong -Wformat -Werror=format-security -O2 -Wall > -pedantic -L/usr/lib -I/usr/include -DWCAT_PREFIX=\"/usr\" > slave.c: In function 'cat_conn_per_pid_limit': > slave.c:558:19: error: 'struct event' has no member named 'ev_flags'; > did you mean 'ev_fd'? > if (ev->ev_flags & EVLIST_ACTIVE) { > ^~ > slave.c:561:23: error: 'struct event' has no member named 'ev_arg'; > did you mean 'ev_fd'? > ev->ev_arg)) > ^~ > Makefile:24: recipe for target 'slave.o' failed > make[1]: *** [slave.o] Error 1 > make[1]: Leaving directory '/<<PKGBUILDDIR>>' > dh_auto_build: make -j1 returned exit code 2 > debian/rules:9: recipe for target 'build' failed > make: *** [build] Error 2 > dpkg-buildpackage: error: debian/rules build gave error exit status 2 > -------------------------------------------------------------------------------- > Build finished at 2017-06-29T05:23:46Z > ... I'm uploading the fixed package to DELAYED/0 with the attached patch. Cheers, Balint
diff -u watchcatd-1.2.1/debian/changelog watchcatd-1.2.1/debian/changelog --- watchcatd-1.2.1/debian/changelog +++ watchcatd-1.2.1/debian/changelog @@ -1,3 +1,10 @@ +watchcatd (1.2.1-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix building with libevent 2.1 (Closes: #869902) + + -- Balint Reczey <[email protected]> Wed, 09 Aug 2017 00:08:58 -0400 + watchcatd (1.2.1-3) unstable; urgency=low * Use /run instead of /var/run only in patch2: unchanged: --- watchcatd-1.2.1.orig/slave.c +++ watchcatd-1.2.1/slave.c @@ -555,10 +555,10 @@ cat = cat->cats.le_next) { if (cat->pid == pid) { struct event *ev = &cat->event; - if (ev->ev_flags & EVLIST_ACTIVE) { + if (ev->ev_evcallback.evcb_flags & EVLIST_ACTIVE) { event_del(ev); if (cat_ev_body_read_with_ret(ev->ev_fd, ev->ev_res, - ev->ev_arg)) + ev->ev_evcallback.evcb_arg)) return 0; } can--;
