#undef EGD_POOL
+/* check for the solaris style getpwuid_r */
+#undef SOLARIS_GETPWUID
-/* check for the bsd style getpwuid_r */
-#undef BSD_GETPWUID
+/* we want our format strings to be acurate. */
+#undef F_UID_T
+
+/* we want our format strings to be acurate. */
+#undef F_PID_T
+
+/* we want our format strings to be acurate. */
+#undef F_XPID_T
case $1 in
debian)
-
-#dpkg-source: warning: source directory `./citadel' is not <sourcepackage>-<upstreamversion> `citadel-6.61'
-
if grep -q "($CITADEL_VERSION" debian/changelog; then
echo rebuilding package.
else
else
fakeroot dpkg-buildpackage
fi
+ ;;
+ csw)
+ if !test -d ~/pkgs/; then
+ mkdir ~/pkgs
+ fi
+ echo "
+PKG=CSWcitadel
+NAME=citadel - The groupware server for Web 2.0
+VERSION=${PACKAGE_VERSION}
+CATEGORY=application
+VENDOR=http://www.citadel.org/ packaged for CSW by Wilfried Goesgens
+HOTLINE=https://uncensored.citadel.org/ Room citadel support
+EMAIL=citadel@outgesourced.org
+" >~/pkgs/citadel
+ export LDFLAGS='-L/opt/csw/lib -L /usr/local/lib'
+ export CFLAGS='-I/opt/csw/include -I/usr/local/include -DDISABLE_CURSES'
+ ./configure \
+ --with-db=/opt/csw/bdb44 \
+ --with-ical=/usr/local/ \
+ --without-curses \
+ --with-prefix=/opt/csw/ \
+ --with-datadir=/opt/csw/var/lib/citadel \
+ --with-sysconfdir=/opt/csw/etc/citadel \
+ --with-ssldir=/opt/csw/etc/ssl/citadel/ \
+ --with-spooldir=/opt/csw/var/spool/citadel \
+ --with-rundir=/opt/csw/var/run/citadel \
+ --with-docdir=/opt/csw/share/doc/citadel-doc/ \
+ --with-pam \
+ --with-zlib \
+ --with-ldap \
+ --with-libsieve
+
+ gmake citserver aidepost msgform citmail userlist sendcommand base64 whobbs citadel
+ gmake DESTDIR=$ACTUAL_DIR/cswstage install-new
+
+
+
;;
sourcedist)
cd ..; tar --exclude .svn -cvzf citadel-$CITADEL_VERSION.tgz citadel-$CITADEL_VERSION/
}
#ifndef __CYGWIN__
if (st.st_uid != CTDLUID) {
- fprintf(stderr, "%s must be owned by uid=%ld but %ld owns it!\n", file_citadel_config, CTDLUID, st.st_uid);
+ fprintf(stderr, "%s must be owned by uid="F_UID_T" but "F_UID_T" owns it!\n",
+ file_citadel_config, CTDLUID, st.st_uid);
exit(CTDLEXIT_CONFIG);
}
int desired_mode = (S_IFREG | S_IRUSR | S_IWUSR) ;
],
ac_cv_call_getpwuid_r=yes, ac_cv_call_getpwuid_r=no)])
if test $ac_cv_call_getpwuid_r = no; then
- AC_DEFINE(BSD_GETPWUID)
+ AC_DEFINE(SOLARIS_GETPWUID)
+ AC_DEFINE(F_UID_T, "%ld")
+ AC_DEFINE(F_PID_T, "%ld")
+ AC_DEFINE(F_XPID_T, "%lx")
+else
+ AC_DEFINE(F_UID_T, "%d")
+ AC_DEFINE(F_PID_T, "%d")
+ AC_DEFINE(F_XPID_T, "%x")
fi
-citadel (7.05-1) stable; urgency=low
+citadel (7.05-9) stable; urgency=high
+
+ * maintainance release, ical upgrade
+
+ -- Wilfried Goesgens <citadel@outgesourced.org> Thu, 1 Mar 2007 21:09:00 +0100
+
+citadel (7.05-8) stable; urgency=low
* Citadel 7.05 release
/* on some dists rundir gets purged on startup. so we need to recreate it. */
if (stat(ctdl_run_dir, &filestats)==-1){
-#ifdef BSD_GETPWUID
+#ifdef SOLARIS_GETPWUID
pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
#else
getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
* corresponding group ids
*/
if (drop_root_perms) {
-#ifdef BSD_GETPWUID
+#ifdef SOLARIS_GETPWUID
pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
#else
getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
else {
fp = fopen(file_pid_file, "w");
if (fp != NULL) {
- fprintf(fp, "%ld\n", child);
+ fprintf(fp, ""F_PID_T"\n", child);
fclose(fp);
}
waitpid(current_child, &status, 0);
void generate_uuid(char *buf) {
static int seq = 0;
- sprintf(buf, "%lx-%x-%x",
+ sprintf(buf, "%lx-"F_XPID_T"-%x",
time(NULL),
getpid(),
(seq++)
int i = 0;
while (i++, i < 100) {
- snprintf(name, len, "/tmp/ctdl.%04x.%04x",
+ snprintf(name, len, "/tmp/ctdl."F_XPID_T".%04x",
getpid(),
rand()
);
char pwdbuffer[256];
lprintf(CTDL_DEBUG, "asking host about <%s>\n", username);
-#ifdef BSD_GETPWUID
+#ifdef SOLARIS_GETPWUID
tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer);
#else
getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);
struct passwd *tempPwdPtr;
char pwdbuffer[256];
-#ifdef BSD_GETPWUID
+#ifdef SOLARIS_GETPWUID
tempPwdPtr = getpwnam_r(username, &pd, pwdbuffer, sizeof(pwdbuffer));
#else
getpwnam_r(username, &pd, pwdbuffer, sizeof pwdbuffer, &tempPwdPtr);