[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit 4b3fede72ce5c0987bcfc1d361e8b2b846bb6984
Author: Clint Adams <schizo at debian.org>
Date:   Fri Mar 28 21:49:30 2008 +0000

    1.9.4
    
    fakeroot (1.9.4) unstable; urgency=low
    
      * configure.ac: patch from Thorsten Glaser to add MirBSD, MidnightBSD,
        Darwin support
      * configure.ac: patch from Thorsten Glaser to not hardcode libc version
        number on OpenBSD.
      * faked.c: patch from Thorsten Glaser to fix printf format strings
      * libfakeroot.c: patch from Thorsten Glaser to fix const cleanness
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-164

diff --git a/configure.ac b/configure.ac
index aa2313e..b19e01b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,8 +381,16 @@ case $target_cpu:$target_os in
 	(*:netbsd*)
 		libcpath="/usr/lib/libc.so.12"
 		;;
-	(*:openbsd*)
-		libcpath="/usr/lib/libc.so.25.2"
+	(*:openbsd*|*:mirbsd*)
+		libcpath=$(/bin/ls -1 /usr/lib/libc.so.* | \
+		    sort -nt. -k3 | tail -1)
+		;;
+	(*:midnightbsd*)
+		libcpath=$(/bin/ls -1 /lib/libc.so.* | \
+		    sort -nt. -k3 | tail -1)
+		;;
+	(*:darwin*)
+		libcpath="/usr/lib/libSystem.dylib"
 		;;
 	(*:hpux*)
 		libcpath="/usr/lib/hpux32/libc.so.1"
diff --git a/debian/changelog b/debian/changelog
index eacb677..44d3163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+fakeroot (1.9.4) unstable; urgency=low
+
+  * configure.ac: patch from Thorsten Glaser to add MirBSD, MidnightBSD,
+    Darwin support
+  * configure.ac: patch from Thorsten Glaser to not hardcode libc version
+    number on OpenBSD.
+  * faked.c: patch from Thorsten Glaser to fix printf format strings
+  * libfakeroot.c: patch from Thorsten Glaser to fix const cleanness
+
+ -- Clint Adams <schizo at debian.org>  Fri, 28 Mar 2008 17:45:08 -0400
+
 fakeroot (1.9.3) unstable; urgency=medium
 
   * configure.ac: patch from Ralf Wildenhues to not override $SHELL
diff --git a/faked.c b/faked.c
index 33763f9..aedb884 100644
--- a/faked.c
+++ b/faked.c
@@ -570,10 +570,10 @@ void debug_stat(const struct fakestat *st){
   fprintf(stderr,"dev:ino=(%llx:%lli), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%lli\n",
 	  st->dev,
 	  st->ino,
-	  st->mode,
-	  st->uid,
-	  st->gid,
-	  st->nlink,
+	  (long)st->mode,
+	  (long)st->uid,
+	  (long)st->gid,
+	  (long)st->nlink,
 	  st->rdev);
 }
 
@@ -649,7 +649,7 @@ void process_chmod(struct fake_msg *buf){
   
   if(debug)
     fprintf(stderr,"FAKEROOT: chmod, mode=%lo\n",
-	    buf->st.mode);
+	    (long)buf->st.mode);
   
   i = data_find(&buf->st, buf->remote);
   if (i != data_end()) {
@@ -670,7 +670,7 @@ void process_mknod(struct fake_msg *buf){
   
   if(debug)
     fprintf(stderr,"FAKEROOT: mknod, mode=%lo\n",
-	    buf->st.mode);
+	    (long)buf->st.mode);
   
   i = data_find(&buf->st, buf->remote);
   if (i != data_end()) {
@@ -763,7 +763,7 @@ void get_msg()
   int r = 0;
 
   if(debug)
-    fprintf(stderr,"FAKEROOT: msg=%i, key=%i\n",msg_get,msg_key);
+    fprintf(stderr,"FAKEROOT: msg=%i, key=%li\n",msg_get,(long)msg_key);
   do {
     r=msgrcv(msg_get,&buf,sizeof(struct fake_msg),0,0);
     if(debug)
@@ -1070,7 +1070,7 @@ int main(int argc, char **argv){
   }
     
   if(debug)
-    fprintf(stderr,"using %i as msg key\n",msg_key);
+    fprintf(stderr,"using %li as msg key\n",(long)msg_key);
   
   msg_get=msgget(msg_key,IPC_CREAT|0600);
   msg_snd=msgget(msg_key+1,IPC_CREAT|0600);
@@ -1086,7 +1086,7 @@ int main(int argc, char **argv){
   }
 
   if(debug)
-    fprintf(stderr,"msg_key=%i\n",msg_key);
+    fprintf(stderr,"msg_key=%li\n",(long)msg_key);
 
   if(justcleanup)
     cleanup(0);
@@ -1185,12 +1185,12 @@ int main(int argc, char **argv){
 	  close(fl);
       setsid();
     } else {
-      printf("%i:%i\n",FAKE_KEY,pid);
+      printf("%li:%i\n",(long)FAKE_KEY,pid);
 
       exit(0);
     }
   } else {
-    printf("%i:%i\n",FAKE_KEY,getpid());
+    printf("%li:%i\n",(long)FAKE_KEY,getpid());
     fflush(stdout);
   }
 
diff --git a/libfakeroot.c b/libfakeroot.c
index 9323d48..aaaa8d6 100644
--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -149,7 +149,7 @@ void load_library_symbols(void){
 
   static int done=0;
   int i;
-  char* msg;
+  const char *msg;
   
   if(!done){
     for(i=0; next_wrap[i].doit; i++){

-- 
fakeroot