diff --git a/debian/changelog b/debian/changelog index da6fdac7c..2e2af3102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -ceo (0.5.25) stable; urgency=low +ceo (0.5.26) jessie; urgency=medium + + * Repackage for jessie + * Fix build for latest package versions + + -- Zachary Seguin Wed, 11 Nov 2015 22:39:49 -0500 + +ceo (0.5.25jessie0) jessie; urgency=low * Replace mention of the safe with the cup. * Remind users that club accounts are free. diff --git a/debian/control b/debian/control index 0c9f0906d..0553c797b 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,9 @@ Uploaders: Michael Spang , David Bartley , Michael Gregson , Jeremy Roman , - Marc Burns -Build-Depends: debhelper (>= 5.0.0), python-dev (>= 2.4), python-support (>= 0.3), libkrb5-dev (>= 1.7), libldap2-dev, libsasl2-dev, libsctp-dev, libprotobuf-c0-dev, libacl1-dev, protobuf-compiler, protobuf-c-compiler + Marc Burns , + Zachary Seguin +Build-Depends: debhelper (>= 5.0.0), python-dev (>= 2.4), dh-python, python, libkrb5-dev (>= 1.7), libldap2-dev, libsasl2-dev, libsctp-dev, libprotobuf-c0-dev, libacl1-dev, protobuf-compiler, protobuf-c-compiler Standards-Version: 3.9.1 Package: ceo-common diff --git a/debian/rules b/debian/rules index 90c0602d0..f3b9a484f 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ binary-arch: build install dh_strip dh_compress dh_fixperms - dh_pysupport + dh_python2 dh_installdeb dh_shlibdeps dh_gencontrol diff --git a/src/addclub.c b/src/addclub.c index 28306d104..c843f0d5d 100644 --- a/src/addclub.c +++ b/src/addclub.c @@ -58,7 +58,7 @@ int addclub(void) { if (spawnvem(cpath, cargv, environ, &preq, &pret, 0)) return 1; - Ceo__AddUserResponse *resp = ceo__add_user_response__unpack(&protobuf_c_default_allocator, + Ceo__AddUserResponse *resp = ceo__add_user_response__unpack(NULL, pret.len, (uint8_t *)pret.buf); if (!resp) fatal("failed to unpack response"); @@ -72,7 +72,7 @@ int addclub(void) { } } - ceo__add_user_response__free_unpacked(resp, &protobuf_c_default_allocator); + ceo__add_user_response__free_unpacked(resp, NULL); strbuf_release(&preq); strbuf_release(&pret); diff --git a/src/addmember.c b/src/addmember.c index 92b963c3b..9a1b3b0bf 100644 --- a/src/addmember.c +++ b/src/addmember.c @@ -68,7 +68,7 @@ int addmember(void) { if (spawnvem(cpath, cargv, environ, &preq, &pret, 0)) return 1; - Ceo__AddUserResponse *resp = ceo__add_user_response__unpack(&protobuf_c_default_allocator, + Ceo__AddUserResponse *resp = ceo__add_user_response__unpack(NULL, pret.len, (uint8_t *)pret.buf); if (!resp) fatal("failed to unpack response"); @@ -82,7 +82,7 @@ int addmember(void) { } } - ceo__add_user_response__free_unpacked(resp, &protobuf_c_default_allocator); + ceo__add_user_response__free_unpacked(resp, NULL); strbuf_release(&preq); strbuf_release(&pret); diff --git a/src/op-adduser.c b/src/op-adduser.c index bbe297a6a..3b0fd82b7 100644 --- a/src/op-adduser.c +++ b/src/op-adduser.c @@ -278,7 +278,7 @@ void cmd_adduser(void) { if (strbuf_read(&in, STDIN_FILENO, 0) < 0) fatalpe("read"); - in_proto = ceo__add_user__unpack(&protobuf_c_default_allocator, + in_proto = ceo__add_user__unpack(NULL, in.len, (uint8_t *)in.buf); if (!in_proto) fatal("malformed add user message"); @@ -295,7 +295,7 @@ void cmd_adduser(void) { if (full_write(STDOUT_FILENO, out.buf, out.len)) fatalpe("write: stdout"); - ceo__add_user__free_unpacked(in_proto, &protobuf_c_default_allocator); + ceo__add_user__free_unpacked(in_proto, NULL); response_delete(out_proto); strbuf_release(&in); diff --git a/src/op-mail.c b/src/op-mail.c index 0947e55e7..5e0657e92 100644 --- a/src/op-mail.c +++ b/src/op-mail.c @@ -178,7 +178,7 @@ void cmd_update_mail(void) { if (strbuf_read(&in, STDIN_FILENO, 0) < 0) fatalpe("read"); - in_proto = ceo__update_mail__unpack(&protobuf_c_default_allocator, + in_proto = ceo__update_mail__unpack(NULL, in.len, (uint8_t *)in.buf); if (!in_proto) fatal("malformed update mail message"); @@ -195,7 +195,7 @@ void cmd_update_mail(void) { if (full_write(STDOUT_FILENO, out.buf, out.len)) fatalpe("write: stdout"); - ceo__update_mail__free_unpacked(in_proto, &protobuf_c_default_allocator); + ceo__update_mail__free_unpacked(in_proto, NULL); response_delete(out_proto); strbuf_release(&in);