Remove Makefile references to removed upstream files

Apply quilt patch dfsg: Patch upstream Makefiles to remove references to
files that had to be removed from the source package for DFSG freeness
reasons.

diff --git a/configure.in b/configure.in
index 06c0c36916b5926ceff3c0259963b65e0ad2febf..8f1524e3cc61b309897601ca2a75d679bc207eda 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -88,9 +88,6 @@ src/lwp/test/Makefile \
 src/mpp/Makefile \
 src/null/Makefile \
 src/package/Makefile \
-src/packaging/MacOS/OpenAFS.Info.plist \
-src/packaging/MacOS/OpenAFS.info \
-src/packaging/MacOS/buildpkg.sh \
 src/packaging/RedHat/openafs.spec \
 src/pam/Makefile \
 src/pinstall/Makefile \

diff --git a/debian/patches/dfsg b/debian/patches/dfsg
deleted file mode 100644 (file)
index c7e73b2..0000000
--- a/debian/patches/dfsg
+++ /dev/null
@@ -1,74 +0,0 @@
-Patch upstream Makefiles to remove references to files that had to be
-removed from the source package for DFSG freeness reasons.  Not suitable
-upstream for obvious reasons.
-
---- openafs.orig/src/afs/Makefile.in
-+++ openafs/src/afs/Makefile.in
-@@ -13,7 +13,7 @@
- all: depinstall
- 
- depinstall: ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h \
--      ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h ${TOP_INCDIR}/afs/sysctl.h
-+      ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h
-       case ${SYS_NAME} in \
-               pmax_ul43 | pmax_ul43a) \
-                       ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \
-@@ -43,7 +43,7 @@
-                       gencat afszcm.cat afs_trace.msf ;; \
-       esac
- 
--install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h ${DESTDIR}${includedir}/afs/sysctl.h
-+install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h
-       case ${SYS_NAME} in \
-               pmax_ul43 | pmax_ul43a) \
-                       ${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \
-@@ -131,7 +131,7 @@
-       ${INSTALL} $? $@
- 
- 
--dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h ${DEST}/include/afs/sysctl.h
-+dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h
-       case ${SYS_NAME} in \
-               pmax_ul43 | pmax_ul43a) \
-                       ${INSTALL} longc_procs.h ${DEST}/include/afs ;; \
---- openafs.orig/src/tviced/Makefile.in
-+++ openafs/src/tviced/Makefile.in
-@@ -38,8 +38,7 @@
- DIROBJS=buffer.o dir.o salvage.o
- 
- VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
--       clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \
--       fstab.o
-+       clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o
- 
- FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
- 
---- openafs.orig/src/util/Makefile.in
-+++ openafs/src/util/Makefile.in
-@@ -12,7 +12,7 @@
- 
- objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
-        hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
--       dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
-+       dirpath.o fileutil.o netutils.o flipbase64.o \
-        afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o \
-        daemon.o rxkstats.o ${REGEX_OBJ}
- 
-@@ -392,4 +392,4 @@
-           assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \
-           hputil.c kreltime.c isathing.c get_krbrlm.c uuid.c serverLog.c \
-           dirpath.c fileutil.c netutils.c flipbase64.c \
--          afs_atomlist.c afs_lhash.c snprintf.c fstab.c
-+          afs_atomlist.c afs_lhash.c snprintf.c
---- openafs.orig/configure.in
-+++ openafs/configure.in
-@@ -88,9 +88,6 @@
- src/mpp/Makefile \
- src/null/Makefile \
- src/package/Makefile \
--src/packaging/MacOS/OpenAFS.Info.plist \
--src/packaging/MacOS/OpenAFS.info \
--src/packaging/MacOS/buildpkg.sh \
- src/packaging/RedHat/openafs.spec \
- src/pam/Makefile \
- src/pinstall/Makefile \

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 5d5d1e9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,14 +0,0 @@
-dfsg
-afs-up-rename
-paths
-fstrace-paths
-module-name
-pam-build
-bos-permissions
-compiler-flags
-no-admin-reference
-ucontext-everywhere
-find-core-files
-ktc-prototypes
-multiple-local-realms
-klog-krb5-man-page

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index 9293c1185a72a2c3c804d0c66d186a3dc0630145..507d18f25bf01d4a30be5faf3964ada78a783624 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -13,7 +13,7 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 all: depinstall
 
 depinstall: ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h \
-       ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h ${TOP_INCDIR}/afs/sysctl.h
+       ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \
@@ -43,7 +43,7 @@ afszcm.cat: afs_trace.msf
                        gencat afszcm.cat afs_trace.msf ;; \
        esac
 
-install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h ${DESTDIR}${includedir}/afs/sysctl.h
+install:   ${DESTDIR}${includedir}/afs/afs.h  ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \
@@ -131,7 +131,7 @@ ${TOP_INCDIR}/afs/nfsclient.h: nfsclient.h
        ${INSTALL} $? $@
 
 
-dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h ${DEST}/include/afs/sysctl.h
+dest:   ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h
        case ${SYS_NAME} in \
                pmax_ul43 | pmax_ul43a) \
                        ${INSTALL} longc_procs.h ${DEST}/include/afs ;; \

diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in
index f7c234f5fb1234ace3e73b05b0289662bdc43721..b0bbf3a3326db677461ac07d917d51a4d23db814 100644 (file)
--- a/src/tviced/Makefile.in
+++ b/src/tviced/Makefile.in
@@ -38,8 +38,7 @@ UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o
 DIROBJS=buffer.o dir.o salvage.o
 
 VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \
-        clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \
-        fstab.o
+        clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o
 
 FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
 

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 7b8c36e3ea9f7e6bee6a12d09981fcc5fd5a5e95..03a28f029aa7b0395ffcce3736d0aeaf0a7e925b 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -12,7 +12,7 @@ HELPER_SPLINT=@HELPER_SPLINT@
 
 objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
         hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
-        dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
+        dirpath.o fileutil.o netutils.o flipbase64.o \
         afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o \
         daemon.o rxkstats.o ${REGEX_OBJ}
 
@@ -392,4 +392,4 @@ check-splint:
            assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \
            hputil.c kreltime.c isathing.c get_krbrlm.c uuid.c serverLog.c \
            dirpath.c fileutil.c netutils.c flipbase64.c \
-           afs_atomlist.c afs_lhash.c snprintf.c fstab.c
+           afs_atomlist.c afs_lhash.c snprintf.c