ALT Linux Sisyphus

diff -ur dmsdos-0.9.2.3-pre2.old/src/Makefile dmsdos-0.9.2.3-pre2/src/Makefile

--- dmsdos-0.9.2.3-pre2.old/src/Makefile	2000-04-19 09:11:53.000000000 +0000
+++ dmsdos-0.9.2.3-pre2/src/Makefile	2012-03-24 22:04:36.418295465 +0000
@@ -10,7 +10,7 @@
 -include /usr/src/linux/.config
 #
 # guess some special flags for CPU type - used for optimization only
-CPUFLAGS=
+CPUFLAGS=-U__linux__ -fPIC
 ifeq ($(CONFIG_M386),y)
 CPUFLAGS= -m386 -DCPU=386 -DUSE_ASM
 endif
@@ -75,7 +75,7 @@
 #
 # CFLAGS for dmsdos module
 # note: some macro expansions require at least -O
-CFLAGS= -Wall -Wstrict-prototypes -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE
+CFLAGS= -Wstrict-prototypes -O3 -fomit-frame-pointer
 CFLAGS+= $(CPUFLAGS)
 #
 # The next lines add some stuff automatically for people using modversions
@@ -86,15 +86,15 @@
 #
 # CFLAGS for the dmsdos daemon
 # note: some macro expansions require at least -O
-DCFLAGS= -Wall -O3 -D__DMSDOS_DAEMON__
+DCFLAGS= -O3 -D__DMSDOS_DAEMON__
 DCFLAGS+= $(CPUFLAGS)
 #
 # CFLAGS for the dmsdos library
 # note: some macro expansions require at least -O
-LCFLAGS= -Wall -O -ggdb -D__DMSDOS_LIB__ -DUSE_FLOCK
+LCFLAGS= -O -ggdb -D__DMSDOS_LIB__ -DUSE_FLOCK
 LCFLAGS+= $(CPUFLAGS) $(LIBC6FLAGS)
 # uncomment the next line if you want a shared library
-# LIB_SHARED = 1
+LIB_SHARED = 1
 #
 # locations where to install the module, the executables and the manpages
 # note: `uname -r` expands to the *currently running* kernel version - if it
@@ -109,6 +109,8 @@
 ##########################################################################
 # The rest of this file are rules how to build which programs.
 
+without_kernel: dcread dmsdosfsck mcdmsdos cvflist cvftest
+
 all: dmsdos-config.h dmsdos.o dutil dmsdosd $(LIBDMSDOS) dcread dmsdosfsck \
      mcdmsdos cvflist cvftest
 
@@ -171,9 +173,7 @@
 
 install: all
 	./check.sh
-	install dmsdos.o -m 644 $(MODULE_PREFIX)/dmsdos.o
-	install dutil $(EXEC_PREFIX)/dutil
-	install dmsdosd $(EXEC_PREFIX)/dmsdosd
+	install dcread $(EXEC_PREFIX)/dcread
 	install dmsdosfsck $(EXEC_PREFIX)/dmsdosfsck
 	install mcdmsdos $(EXEC_PREFIX)/mcdmsdos
 	install cvflist $(EXEC_PREFIX)/cvflist
@@ -222,24 +222,19 @@
 LIBDMSDOS = libdmsdos.so.0.9.2
 
 $(LIBDMSDOS): $(LIB_OBJS)
-	ld --shared --soname=$(LIBDMSDOS) -o $(LIBDMSDOS) $^
+	gcc --shared -Xlinker --soname=$(LIBDMSDOS) -o $(LIBDMSDOS) $^
 	ln -s $(LIBDMSDOS) libdmsdos.so
 
 endif
 
 dcread: dcread.c $(LIBDMSDOS) dmsdos.h dmsdos-config.h
-	$(CC) -Wall -ggdb -o dcread dcread.c -L. -ldmsdos
 
 mcdmsdos: mcdmsdos.c $(LIBDMSDOS) dmsdos.h dmsdos-config.h
-	$(CC) -Wall -ggdb -o mcdmsdos mcdmsdos.c -L. -ldmsdos
 
 dmsdosfsck: dmsdosfsck.c $(LIBDMSDOS) dmsdos.h dmsdos-config.h
-	$(CC) -Wall -o dmsdosfsck dmsdosfsck.c -L. -ldmsdos
 
 cvftest: cvftest.c
-	$(CC) -Wall -o cvftest cvftest.c
 
 cvflist: cvflist.c
-	$(CC) -Wall -o cvflist cvflist.c
 
 -include depend
diff -ur dmsdos-0.9.2.3-pre2.old/src/cvflist.c dmsdos-0.9.2.3-pre2/src/cvflist.c
--- dmsdos-0.9.2.3-pre2.old/src/cvflist.c	2000-04-12 08:26:45.000000000 +0000
+++ dmsdos-0.9.2.3-pre2/src/cvflist.c	2012-03-24 22:03:24.596262245 +0000
@@ -29,8 +29,6 @@
 #include<stdio.h>
 #include<string.h>
 #include<malloc.h>
-#include<asm/unaligned.h>
-#include<asm/types.h>
 #include<unistd.h>
 #include<fcntl.h>
 
diff -ur dmsdos-0.9.2.3-pre2.old/src/dutil.c dmsdos-0.9.2.3-pre2/src/dutil.c
--- dmsdos-0.9.2.3-pre2.old/src/dutil.c	2000-04-14 14:38:05.000000000 +0000
+++ dmsdos-0.9.2.3-pre2/src/dutil.c	2012-03-24 22:03:24.596262245 +0000
@@ -48,7 +48,7 @@
 
 void error(void)
 { perror("ioctl failed");
-  exit();
+  exit(1);
 }
 
 int main(int argc, char*argv[])