projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d446f6d
)
Quick hack to buildpackages, use "buildpackages version" to simply have it tell you...
Release_902
author
Art Cancro
<ajc@citadel.org>
Fri, 6 May 2016 05:50:50 +0000
(
01:50
-0400)
committer
Art Cancro
<ajc@citadel.org>
Fri, 6 May 2016 05:50:50 +0000
(
01:50
-0400)
citadel/buildpackages
patch
|
blob
|
history
citadel/utils/setup.c
patch
|
blob
|
history
libcitadel/buildpackages
patch
|
blob
|
history
libcitadel/configure.in
patch
|
blob
|
history
libcitadel/lib/libcitadel.h
patch
|
blob
|
history
textclient/buildpackages
patch
|
blob
|
history
webcit/buildpackages
patch
|
blob
|
history
webcit/configure.ac
patch
|
blob
|
history
webcit/webcit.h
patch
|
blob
|
history
diff --git
a/citadel/buildpackages
b/citadel/buildpackages
index 2803024573dd9a126722da149080a3270729ad0c..3b9f6f881cf32477db0729aa79d7a16367231d78 100755
(executable)
--- a/
citadel/buildpackages
+++ b/
citadel/buildpackages
@@
-111,6
+111,9
@@
EMAIL=citadel@outgesourced.org
\
-chvzf citadel-$CITADEL_VERSION.tar.gz citadel-$CITADEL_VERSION/
;;
\
-chvzf citadel-$CITADEL_VERSION.tar.gz citadel-$CITADEL_VERSION/
;;
+ version)
+ echo This would build citadel-$CITADEL_VERSION
+ ;;
*)
echo "Not yet implemented. we have: debian "
;;
*)
echo "Not yet implemented. we have: debian "
;;
diff --git
a/citadel/utils/setup.c
b/citadel/utils/setup.c
index edb0a0ab2dffc032884416f5bb70bbd4622bbec2..6eaa957d3d4829c46262adbb39ab49ae186a8bc7 100644
(file)
--- a/
citadel/utils/setup.c
+++ b/
citadel/utils/setup.c
@@
-863,7
+863,7
@@
void edit_value(int curr)
pw = getpwnam(ctdluidname);
if (pw != NULL) {
ctdluid = pw->pw_uid;
pw = getpwnam(ctdluidname);
if (pw != NULL) {
ctdluid = pw->pw_uid;
-
+ }
else if (atoi(ctdluidname) > 0) {
ctdluid = atoi(ctdluidname);
}
else if (atoi(ctdluidname) > 0) {
ctdluid = atoi(ctdluidname);
}
diff --git
a/libcitadel/buildpackages
b/libcitadel/buildpackages
index 1b31ee8015b2fd3265b4e8812770a88bca30904e..b7b8ab01d176feb6b44e408e50753f90aabd2a78 100755
(executable)
--- a/
libcitadel/buildpackages
+++ b/
libcitadel/buildpackages
@@
-114,6
+114,9
@@
EMAIL=citadel@outgesourced.org
\
-chvzf libcitadel-$LIBCITADEL_VERSION.tar.gz libcitadel-$LIBCITADEL_VERSION/
;;
\
-chvzf libcitadel-$LIBCITADEL_VERSION.tar.gz libcitadel-$LIBCITADEL_VERSION/
;;
+ version)
+ echo This would build libcitadel-$LIBCITADEL_VERSION
+ ;;
*)
echo "Not yet implemented. we have: debian, sourcedist "
;;
*)
echo "Not yet implemented. we have: debian, sourcedist "
;;
diff --git
a/libcitadel/configure.in
b/libcitadel/configure.in
index 595f0b6ed806275a8e4d355f6509fc86ee0db185..fe0c76f4f5d190bc30ecf20a0a44554656e45d66 100755
(executable)
--- a/
libcitadel/configure.in
+++ b/
libcitadel/configure.in
@@
-5,25
+5,22
@@
dnl
dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
AC_PREREQ(2.52)
dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
AC_PREREQ(2.52)
-AC_INIT(libcitadel,
4.9.01
, http://uncensored.citadel.org)
+AC_INIT(libcitadel,
902
, http://uncensored.citadel.org)
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
AC_CONFIG_SRCDIR(tests/Makefile.in)
dnl
AC_CONFIG_SRCDIR(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
AC_CONFIG_SRCDIR(tests/Makefile.in)
dnl
-dnl
Increment LIBREVISION if source code has changed at all
+dnl
Set LIBREVISION to the ever-ascending libcitadel version number.
dnl
dnl
-dnl If the API has changed, increment LIBCURRENT
and set LIBREVISION to 0
+dnl If the API has changed, increment LIBCURRENT
.
dnl
dnl
-dnl If the API changes compatibly (i.e. simply adding a new function
-dnl without changing or removing earlier interfaces), then increment LIBAGE.
-dnl
-dnl If the API changes incompatibly set LIBAGE back to 0
+dnl Set LIBAGE to 0.
dnl
LIBCURRENT=4
dnl
LIBCURRENT=4
-LIBREVISION=90
1
+LIBREVISION=90
2
LIBAGE=0
sinclude(conftools/libtool.m4)
LIBAGE=0
sinclude(conftools/libtool.m4)
diff --git
a/libcitadel/lib/libcitadel.h
b/libcitadel/lib/libcitadel.h
index 366b8a62c8ce977ce0598403a32061f197867c6f..c0689720a25f42af1ffb6afe4e9c72896db376bc 100644
(file)
--- a/
libcitadel/lib/libcitadel.h
+++ b/
libcitadel/lib/libcitadel.h
@@
-1,7
+1,7
@@
/*
* Header file for libcitadel
*
/*
* Header file for libcitadel
*
- * Copyright (c) 1987-201
3
by the citadel.org team
+ * Copyright (c) 1987-201
6
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
@@
-28,7
+28,7
@@
#include <sys/types.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <netinet/in.h>
-#define LIBCITADEL_VERSION_NUMBER 90
1
+#define LIBCITADEL_VERSION_NUMBER 90
2
/*
* Here's a bunch of stupid magic to make the MIME parser portable.
/*
* Here's a bunch of stupid magic to make the MIME parser portable.
diff --git
a/textclient/buildpackages
b/textclient/buildpackages
index 671e92da5535d155a6b177d2dee1c1160cc41c7d..c784a48c4c13bc8dc2f2e25b2b4bd6b2565db0aa 100755
(executable)
--- a/
textclient/buildpackages
+++ b/
textclient/buildpackages
@@
-113,6
+113,9
@@
EMAIL=citadel@outgesourced.org
\
-chvzf textclient-$CITADEL_VERSION.tar.gz textclient-$CITADEL_VERSION/
;;
\
-chvzf textclient-$CITADEL_VERSION.tar.gz textclient-$CITADEL_VERSION/
;;
+ version)
+ echo This would build textclient-$CITADEL_VERSION
+ ;;
*)
echo "Not yet implemented. we have: debian "
;;
*)
echo "Not yet implemented. we have: debian "
;;
diff --git
a/webcit/buildpackages
b/webcit/buildpackages
index 49dda253710f0c8391c53f96e4533b30f7742451..511ab792555b8ff0449e1df9e79305634f989aef 100755
(executable)
--- a/
webcit/buildpackages
+++ b/
webcit/buildpackages
@@
-79,6
+79,9
@@
case $1 in
./webcit -G `pwd`/i18n_templatelist.c
cd po/webcit; ./create-pot.sh
;;
./webcit -G `pwd`/i18n_templatelist.c
cd po/webcit; ./create-pot.sh
;;
+ version)
+ echo This would build webcit-${WEBCIT_VERSION}
+ ;;
*)
echo "Not yet implemented. we have: debian, sourcedist, i18n (needs ready compiled & installed webcit in your system)"
;;
*)
echo "Not yet implemented. we have: debian, sourcedist, i18n (needs ready compiled & installed webcit in your system)"
;;
diff --git
a/webcit/configure.ac
b/webcit/configure.ac
index a523add563980529a3ba429c074aaf3e4a15392b..ac631f331394e0eb3baa796cb49af93409aedec4 100644
(file)
--- a/
webcit/configure.ac
+++ b/
webcit/configure.ac
@@
-1,6
+1,6
@@
dnl Process this file with autoconf to produce a configure script.
dnl $Id$
dnl Process this file with autoconf to produce a configure script.
dnl $Id$
-AC_INIT([WebCit], [90
1
], [http://www.citadel.org/])
+AC_INIT([WebCit], [90
2
], [http://www.citadel.org/])
AC_SUBST(PROG_SUBDIRS)
AC_SUBST(PROG_SUBDIRS)
diff --git
a/webcit/webcit.h
b/webcit/webcit.h
index fe34c23da6cd182463941962a8a4393b5e478ca1..d8fa7089bed378675a832709a43500510a72d24d 100644
(file)
--- a/
webcit/webcit.h
+++ b/
webcit/webcit.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 1987-201
5
by the citadel.org team
+ * Copyright (c) 1987-201
6
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 3.
*
* This program is open source software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 3.
@@
-127,9
+127,9
@@
extern char *ssl_cipher_list;
#define PORT_NUM 2000 /* port number to listen on */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
#define PORT_NUM 2000 /* port number to listen on */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 90
1
/* This version of WebCit */
-#define MINIMUM_CIT_VERSION 90
1
/* Minimum required version of Citadel server */
-#define LIBCITADEL_MIN 90
1
/* Minimum required version of libcitadel */
+#define CLIENT_VERSION 90
2
/* This version of WebCit */
+#define MINIMUM_CIT_VERSION 90
2
/* Minimum required version of Citadel server */
+#define LIBCITADEL_MIN 90
2
/* Minimum required version of libcitadel */
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define TARGET "webcit01" /* Window target for inline URL's */
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define TARGET "webcit01" /* Window target for inline URL's */