Update CEO for latest package versions on Jessie

This commit is contained in:
Zachary Seguin 2015-11-11 22:43:57 -05:00
parent 5cf982e8d5
commit db90d4ce00
7 changed files with 20 additions and 12 deletions

9
debian/changelog vendored
View File

@ -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 <ztseguin@csclub.uwaterloo.ca> Wed, 11 Nov 2015 22:39:49 -0500
ceo (0.5.25jessie0) jessie; urgency=low
* Replace mention of the safe with the cup. * Replace mention of the safe with the cup.
* Remind users that club accounts are free. * Remind users that club accounts are free.

5
debian/control vendored
View File

@ -6,8 +6,9 @@ Uploaders: Michael Spang <mspang@csclub.uwaterloo.ca>,
David Bartley <dtbartle@csclub.uwaterloo.ca>, David Bartley <dtbartle@csclub.uwaterloo.ca>,
Michael Gregson <mgregson@csclub.uwaterloo.ca>, Michael Gregson <mgregson@csclub.uwaterloo.ca>,
Jeremy Roman <jbroman@csclub.uwaterloo.ca>, Jeremy Roman <jbroman@csclub.uwaterloo.ca>,
Marc Burns <m4burns@csclub.uwaterloo.ca> Marc Burns <m4burns@csclub.uwaterloo.ca>,
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 Zachary Seguin <ztseguin@csclub.uwaterloo.ca>
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 Standards-Version: 3.9.1
Package: ceo-common Package: ceo-common

2
debian/rules vendored
View File

@ -38,7 +38,7 @@ binary-arch: build install
dh_strip dh_strip
dh_compress dh_compress
dh_fixperms dh_fixperms
dh_pysupport dh_python2
dh_installdeb dh_installdeb
dh_shlibdeps dh_shlibdeps
dh_gencontrol dh_gencontrol

View File

@ -58,7 +58,7 @@ int addclub(void) {
if (spawnvem(cpath, cargv, environ, &preq, &pret, 0)) if (spawnvem(cpath, cargv, environ, &preq, &pret, 0))
return 1; 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); pret.len, (uint8_t *)pret.buf);
if (!resp) if (!resp)
fatal("failed to unpack response"); 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(&preq);
strbuf_release(&pret); strbuf_release(&pret);

View File

@ -68,7 +68,7 @@ int addmember(void) {
if (spawnvem(cpath, cargv, environ, &preq, &pret, 0)) if (spawnvem(cpath, cargv, environ, &preq, &pret, 0))
return 1; 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); pret.len, (uint8_t *)pret.buf);
if (!resp) if (!resp)
fatal("failed to unpack response"); 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(&preq);
strbuf_release(&pret); strbuf_release(&pret);

View File

@ -278,7 +278,7 @@ void cmd_adduser(void) {
if (strbuf_read(&in, STDIN_FILENO, 0) < 0) if (strbuf_read(&in, STDIN_FILENO, 0) < 0)
fatalpe("read"); 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); in.len, (uint8_t *)in.buf);
if (!in_proto) if (!in_proto)
fatal("malformed add user message"); fatal("malformed add user message");
@ -295,7 +295,7 @@ void cmd_adduser(void) {
if (full_write(STDOUT_FILENO, out.buf, out.len)) if (full_write(STDOUT_FILENO, out.buf, out.len))
fatalpe("write: stdout"); 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); response_delete(out_proto);
strbuf_release(&in); strbuf_release(&in);

View File

@ -178,7 +178,7 @@ void cmd_update_mail(void) {
if (strbuf_read(&in, STDIN_FILENO, 0) < 0) if (strbuf_read(&in, STDIN_FILENO, 0) < 0)
fatalpe("read"); 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); in.len, (uint8_t *)in.buf);
if (!in_proto) if (!in_proto)
fatal("malformed update mail message"); fatal("malformed update mail message");
@ -195,7 +195,7 @@ void cmd_update_mail(void) {
if (full_write(STDOUT_FILENO, out.buf, out.len)) if (full_write(STDOUT_FILENO, out.buf, out.len))
fatalpe("write: stdout"); 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); response_delete(out_proto);
strbuf_release(&in); strbuf_release(&in);