more fixes

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index 4b04f6a79e519c8adb673aa5118e97b16f81b781..a5cf4076d2fde68e207480669408afbc73dc768b 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -44,6 +44,8 @@ char ctdl_spool_dir[PATH_MAX]="network";
 char ctdl_netout_dir[PATH_MAX]="network/spoolout";
 char ctdl_netin_dir[PATH_MAX]="network/spoolin";
 char ctdl_netcfg_dir[PATH_MAX]="netconfigs";
+char ctdl_sbin_dir[PATH_MAX];
+char ctdl_bin_dir[PATH_MAX];
 
 /* some of our files, that are needed in several places */
 char file_citadel_control[PATH_MAX]="";
@@ -80,8 +82,17 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        const char* basedir;
        char dirbuffer[PATH_MAX]="";
 
-
-
+       /*
+        * Ok, we keep our binaries either in the citadel base dir,
+        * or in /usr/sbin / /usr/bin
+        */
+#ifdef HAVE_ETC_DIR
+       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, "/usr/sbin/");
+       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, "/usr/bin/");
+#else
+       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, "/usr/sbin");
+       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, "/usr/bin");
+#endif
 
 #ifndef HAVE_ETC_DIR
        basedir=ctdldir;

diff --git a/citadel/citadel_dirs.h b/citadel/citadel_dirs.h
index 2ccf76f0efcf1d18944e648e9a7db6d24c0507b4..cae21853299ebf346cf14885c9f3538b52358c19 100644 (file)
--- a/citadel/citadel_dirs.h
+++ b/citadel/citadel_dirs.h
@@ -26,6 +26,9 @@ extern char ctdl_netout_dir[PATH_MAX];
 extern char ctdl_netin_dir[PATH_MAX];
 extern char ctdl_netcfg_dir[PATH_MAX];
 extern char ctdl_bbsbase_dir[PATH_MAX];
+extern char ctdl_sbin_dir[PATH_MAX];
+extern char ctdl_bin_dir[PATH_MAX];
+
 
 /* some of the frequently used files */
 extern char file_citadel_control[PATH_MAX];

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index 98133136d6a30627238d688dae8a0e380d772ed6..223b7211388aa3d6551edc6acb8cea199fe5399f 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,10 @@
+citadel (6.71-1) unstable; urgency=low
+       
+  * update to actual Citadel CVS. many new features. see Packages changelog.
+
+ -- Wilfried Goesgens <w.goesgens@chaosindustries.de>  Sat, 21 Jan 2006 19:07:00 +0100
+       
+
 citadel (6.70-1) unstable; urgency=low
        
   * update to actual Citadel CVS. many new features. see Packages changelog.

diff --git a/citadel/debian/citadel-unixlogin.substvars b/citadel/debian/citadel-unixlogin.substvars
index 9374607278a0a68a1dd90d99d45cd5e38d5b08f8..3c500e0f6cfa19258efe9d86d837d5d620c28aae 100644 (file)
--- a/citadel/debian/citadel-unixlogin.substvars
+++ b/citadel/debian/citadel-unixlogin.substvars
@@ -1 +1 @@
-shlibs:Depends=libc6 (>= 2.3.5-1)
+shlibs:Depends=libc6 (>= 2.3.5-1), libpam0g (>= 0.76)