fix fix-translator-functions.patch

1 files changed, 18 insertions, 16 deletions

diff --git a/debian/patches/fix-translator-functions.patch b/debian/patches/fix-translator-functions.patch
index 1bc343e5..f12a7bdc 100644
--- a/debian/patches/fix-translator-functions.patch
+++ b/debian/patches/fix-translator-functions.patch
@@ -13,11 +13,11 @@ index 96b4772..ffcba9c 100644
  
  #define SERVERCOPY 1
 diff --git a/libtrivfs/Makefile b/libtrivfs/Makefile
-index 241b76d..5d27620 100644
+index 3e4c039..921acbe 100644
 --- a/libtrivfs/Makefile
 +++ b/libtrivfs/Makefile
 @@ -38,7 +38,7 @@ FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-stubs.c fsys-syncfs.c \
- 	fsys-get-children.c fsys-get-source.c
+ 	file-get-children.c file-get-source.c
  
  OTHERSRCS=demuxer.c protid-clean.c protid-dup.c cntl-create.c \
 -	cntl-clean.c migsupport.c times.c startup.c open.c \
@@ -81,7 +81,7 @@ index d81e5a8..0000000
 -#define FSYS_IMPORTS import <hurd/trivfs.h>;
 diff --git a/libtrivfs/mig-decls.h b/libtrivfs/mig-decls.h
 new file mode 100644
-index 0000000..1bbca4e
+index 0000000..2baaee8
 --- /dev/null
 +++ b/libtrivfs/mig-decls.h
 @@ -0,0 +1,105 @@
@@ -102,8 +102,8 @@ index 0000000..1bbca4e
 +   along with this program; if not, write to the Free Software
 +   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 +
-+#ifndef __MIG_DECLS_H__
-+#define __MIG_DECLS_H__
++#ifndef __TRIVFS_MIG_DECLS_H__
++#define __TRIVFS_MIG_DECLS_H__
 +
 +#include "priv.h"
 +
@@ -189,7 +189,7 @@ index 0000000..1bbca4e
 +    ports_port_deref (cred);
 +}
 +
-+#endif /* __MIG_DECLS_H__ */
++#endif /* __TRIVFS_MIG_DECLS_H__ */
 diff --git a/libtrivfs/mig-mutate.h b/libtrivfs/mig-mutate.h
 new file mode 100644
 index 0000000..fad5389
@@ -321,7 +321,7 @@ index b2d98e1..0000000
 -    ports_port_deref (cred);
 -}
 diff --git a/libtrivfs/trivfs.h b/libtrivfs/trivfs.h
-index cf817b5..e2a48b4 100644
+index 306a430..bb456ff 100644
 --- a/libtrivfs/trivfs.h
 +++ b/libtrivfs/trivfs.h
 @@ -37,11 +37,6 @@ struct trivfs_protid
@@ -348,7 +348,7 @@ index cf817b5..e2a48b4 100644
  
  /* The user must define these variables. */
  extern int trivfs_fstype;
-@@ -266,41 +256,9 @@ error_t trivfs_add_port_bucket (struct port_bucket **bucket);
+@@ -267,41 +257,9 @@ error_t trivfs_add_port_bucket (struct port_bucket **bucket);
  /* Remove the previously added dynamic port bucket BUCKET, freeing it
     if it was allocated by trivfs_add_port_bucket.  */
  void trivfs_remove_port_bucket (struct port_bucket *bucket);
@@ -423,7 +423,7 @@ index 6777680..bd876ee 100644
  /* devinet.c */
 diff --git a/pfinet/mig-decls.h b/pfinet/mig-decls.h
 new file mode 100644
-index 0000000..2898991
+index 0000000..ec8fb23
 --- /dev/null
 +++ b/pfinet/mig-decls.h
 @@ -0,0 +1,55 @@
@@ -446,8 +446,8 @@ index 0000000..2898991
 +   You should have received a copy of the GNU General Public License
 +   along with the GNU Hurd.  If not, see <http://www.gnu.org/licenses/>.  */
 +
-+#ifndef __MIG_DECLS_H__
-+#define __MIG_DECLS_H__
++#ifndef __PFINET_MIG_DECLS_H__
++#define __PFINET_MIG_DECLS_H__
 +
 +#include "pfinet.h"
 +
@@ -481,13 +481,13 @@ index 0000000..2898991
 +    ports_port_deref (addr);
 +}
 +
-+#endif /* __MIG_DECLS_H__ */
++#endif /* __PFINET_MIG_DECLS_H__ */
 diff --git a/pfinet/mig-mutate.h b/pfinet/mig-mutate.h
 new file mode 100644
-index 0000000..4d97408
+index 0000000..b778077
 --- /dev/null
 +++ b/pfinet/mig-mutate.h
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,39 @@
 +/*
 +   Copyright (C) 1995 Free Software Foundation, Inc.
 +   Written by Michael I. Bushnell, p/BSG.
@@ -518,7 +518,9 @@ index 0000000..4d97408
 +
 +#define SOCKET_INTRAN sock_user_t begin_using_socket_port (socket_t)
 +#define SOCKET_DESTRUCTOR end_using_socket_port (sock_user_t)
-+#define SOCKET_IMPORTS import "mig-decls.h";
++#define SOCKET_IMPORTS				\
++  import "mig-decls.h";				\
++  import "../libtrivfs/mig-decls.h";		\
 +
 +#define ADDRPORT_INTRAN sock_addr_t begin_using_sockaddr_port (addr_port_t)
 +#define ADDRPORT_DESTRUCTOR end_using_sockaddr_port (sock_addr_t)
@@ -630,7 +632,7 @@ index 9725dab..46aa97b 100644
  enum {
    PORTCLASS_INET,
 diff --git a/trans/Makefile b/trans/Makefile
-index c0386d0..bdc9681 100644
+index 90df479..e74a869 100644
 --- a/trans/Makefile
 +++ b/trans/Makefile
 @@ -35,7 +35,7 @@ password-LDLIBS = $(LIBCRYPT)