diff -Naur mars_nwe/doc/BUGS mars-nwe-0.99-pl20-gentoo-patch/doc/BUGS --- mars_nwe/doc/BUGS 1998-02-04 15:39:03.000000000 +0500 +++ mars-nwe-0.99-pl20-gentoo-patch/doc/BUGS 2004-10-25 14:05:13.000000000 +0600 @@ -31,7 +31,7 @@ - if you send nwserv.conf, please remove the comments first. A simple way would be: 'make showconf' in the mars_nwserv directory or do a - 'grep "^[ \t]*[0-9]" /etc/nwserv.conf' + 'grep "^[ \t]*[0-9]" /etc/conf.d/nwroute' - report whether your client runs correct under a 'real Novell-Server'. ( if you have one ;) ) diff -Naur mars_nwe/doc/BUGS.nl mars-nwe-0.99-pl20-gentoo-patch/doc/BUGS.nl --- mars_nwe/doc/BUGS.nl 1999-03-01 00:19:14.000000000 +0500 +++ mars-nwe-0.99-pl20-gentoo-patch/doc/BUGS.nl 2004-10-25 14:05:21.000000000 +0600 @@ -33,7 +33,7 @@ de veranderingen in nwserv.conf(nw.ini) en de config.h - als je nwserv.conf opstuurd, haal het commentaar eruit. doe dit door in te tikken 'make showconf' in de mars_nwe source dir - of doe 'grep "^[ \t*[0-9]" /etc/nwserv.conf' + of doe 'grep "^[ \t*[0-9]" /etc/conf.d/nwroute' - vermeld of je client wel loopt met een 'echte Novell-server' (als je er een hebt. ;) ) diff -Naur mars_nwe/doc/FAQS mars-nwe-0.99-pl20-gentoo-patch/doc/FAQS --- mars_nwe/doc/FAQS 1999-02-22 02:47:12.000000000 +0500 +++ mars-nwe-0.99-pl20-gentoo-patch/doc/FAQS 2004-10-25 11:04:28.000000000 +0600 @@ -79,7 +79,7 @@ Q: What is an easy way to get a 'clean' nwserv.conf file without comments. A: Do a 'make showconf' in the mars_nwe directory or do a - 'grep "^[ \t]*[0-9]" /etc/nwserv.conf' + 'grep "^[ \t]*[0-9]" /etc/conf.d/nwserv.conf' Q: Which frame type should I use (Ethernet_II, 802.2, SNAP or 802.3) ? A: Use Ethernet_II on a new network as it can carry anything and everything diff -Naur mars_nwe/doc/INSTALL.ger mars-nwe-0.99-pl20-gentoo-patch/doc/INSTALL.ger --- mars_nwe/doc/INSTALL.ger 1997-08-08 02:34:10.000000000 +0600 +++ mars-nwe-0.99-pl20-gentoo-patch/doc/INSTALL.ger 2004-10-25 14:05:39.000000000 +0600 @@ -76,7 +76,7 @@ das einige Sekunden dauern. -Erlaeuterungen zu Punkt 1 in /etc/nwserv.conf : +Erlaeuterungen zu Punkt 1 in /etc/conf.d/nwroute : Wenn der NetAdmin die Homeverzeichnisse des LINUX-Servers dem einzelnen Usern durch das MAP Kommando bereitstellt, kann er das auf @@ -85,7 +85,7 @@ Angenommen, der User test2 hat sich am NWE angemeldet. Er hat bereits Dateien in seinem Verzeichnis /home/test2 gespeichert. -Je nachdem welcher Eintrag 1 in der Datei /etc/nwserv.conf (natuerlich +Je nachdem welcher Eintrag 1 in der Datei /etc/conf.d/nwroute (natuerlich neben anderen) vorgenommen worden ist, hat das MAP-Kommando ein anderes Ergebnis: @@ -94,7 +94,7 @@ Befehl DOS MAP H:=MARS\HOMEDIR: MAP H:=MARS\HOMEDIR: -Eintrag in /etc/nwserv.conf +Eintrag in /etc/conf.d/nwroute 1 HOMEDIR ~ k 1 HOMEDIR /home k Resultat DIR *.* @@ -106,7 +106,7 @@ Dateien. Dateien anschauen zu koennen. Achtung ! -Ein Eintrag in /etc/nwserv.conf +Ein Eintrag in /etc/conf.d/nwroute 1 HOMEDIR /home/~ k diff -Naur mars_nwe/emutli1.c mars-nwe-0.99-pl20-gentoo-patch/emutli1.c --- mars_nwe/emutli1.c 1998-05-07 15:32:52.000000000 +0600 +++ mars-nwe-0.99-pl20-gentoo-patch/emutli1.c 2004-11-01 15:03:04.000000000 +0500 @@ -340,7 +340,7 @@ errorp(10, "Problem", "probably kernel-IPX is not setup correctly"); exit(1); } else { - ipx_config_data cfgdata; + struct ipx_config_data cfgdata; struct sockaddr_ipx ipxs; ioctl(sock, SIOCIPXCFGDATA, &cfgdata); org_auto_interfaces = diff -Naur mars_nwe/examples/config.h mars-nwe-0.99-pl20-gentoo-patch/examples/config.h --- mars_nwe/examples/config.h 2000-06-22 22:19:49.000000000 +0600 +++ mars-nwe-0.99-pl20-gentoo-patch/examples/config.h 2004-10-25 14:05:54.000000000 +0600 @@ -11,7 +11,7 @@ # define PATHNAME_PROGS "." /* where to find the executables */ # define PATHNAME_BINDERY "." /* directory for bindery-files */ #else -# define FILENAME_NW_INI "/etc/nwserv.conf" +# define FILENAME_NW_INI "/etc/conf.d/nwroute" /* full name of ini (conf) file */ # define PATHNAME_PROGS "/usr/sbin" /* where to find the executables */ # define PATHNAME_BINDERY "/var/nwserv/db" /* directory for bindery-files */ diff -Naur mars_nwe/examples/Makefile.o mars-nwe-0.99-pl20-gentoo-patch/examples/Makefile.o --- mars_nwe/examples/Makefile.o 1970-01-01 05:00:00.000000000 +0500 +++ mars-nwe-0.99-pl20-gentoo-patch/examples/Makefile.o 2004-10-25 14:05:48.000000000 +0600 @@ -0,0 +1,176 @@ +# 1 "makefile.c" +# 1 "" +# 1 "" +# 1 "makefile.c" + + + + +VPATH=$(V_VPATH) + +O=.o +C=.c + +V_H=0 +V_L=99 +P_L=20 + + +DISTRIB=mars_nwe + +DISTRIBF=$(DISTRIB)-$(V_H).$(V_L).pl$(P_L) +PATCHF=$(DISTRIBF) + + + + + +STERN=* + +MAKEPATCH=diff -rub --new-file + +DESTMAKEFILE=Makefile.o +# 74 "makefile.c" +PROG1= +PROG2=nwserv +PROG3=nwconn +PROG4=ncpserv +PROG5=nwclient +PROG6=nwbind +PROG7=nwrouted +PROG8=dbmtool +PROG9=ftrustee + +# 1 "../config.h" 1 +# 85 "makefile.c" 2 + +M_FILENAME_NW_INI="/etc/conf.d/nwroute" + + + + + +M_PATHNAME_PROGS="/usr/sbin" + + + + +M_PATHNAME_BINDERY="/var/nwserv/db" +# 108 "makefile.c" +EMUTLIOBJ=emutli$(O) + +EMUTLIOBJ1=emutli1$(O) +NWROUTE_O=nwroute$(O) +# 123 "makefile.c" +INSTALLPROGS=$(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) $(PROG6) $(NWROUTED) +PROGS=$(INSTALLPROGS) $(PROG8) $(PROG9) + +OBJ1= $(EMUTLIOBJ) net1$(O) tools$(O) +OBJ2= $(OBJ1) $(EMUTLIOBJ1) $(NWROUTE_O) +OBJ3= $(OBJ1) connect$(O) namspace$(O) nwvolume$(O) nwfile$(O) unxfile$(O) nwqconn$(O) nameos2$(O) nwfname$(O) nwshare$(O) extpipe$(O) nwattrib$(O) trustee$(O) + + +OBJ4= $(OBJ1) +OBJ5= $(OBJ1) +OBJ6= $(OBJ1) nwdbm$(O) nwcrypt$(O) unxlog$(O) sema$(O) nwqueue$(O) unxfile$(O) +OBJ7= $(OBJ1) emutli1$(O) +OBJ8= $(OBJ6) +OBJ9= tools$(O) nwfname$(O) unxfile$(O) nwvolume$(O) nwattrib$(O) trustee$(O) + +OBJS= $(EMUTLIOBJ) net1$(O) tools$(O) $(EMUTLIOBJ1) $(NWROUTE_O) connect$(O) namspace$(O) nwvolume$(O) nwfile$(O) unxfile$(O) nwqconn$(O) nameos2$(O) nwfname$(O) nwshare$(O) extpipe$(O) nwattrib$(O) trustee$(O) nwdbm$(O) nwcrypt$(O) unxlog$(O) sema$(O) nwqueue$(O) $(PROG2)$(O) $(PROG3)$(O) $(PROG4)$(O) $(PROG5)$(O) $(PROG6)$(O) $(PROG7)$(O) $(PROG8)$(O) $(PROG9)$(O) +# 147 "makefile.c" +HOBJ3= $(PROG3)$(O) connect$(O) namspace$(O) nwvolume$(O) nwfile$(O) unxfile$(O) + + +HOBJ6= $(PROG6)$(O) sema$(O) + +$(PROG2): $(PROG2)$(O) $(OBJ2) + $(CC) -o $(VPATH)/$(PROG2) $(PROG2)$(O) $(OBJ2) $(CRYPTLIB) $(NSLLIB) + +$(PROG3): $(PROG3)$(O) $(OBJ3) + $(CC) -o $(VPATH)/$(PROG3) $(PROG3)$(O) $(OBJ3) $(CRYPTLIB) $(NSLLIB) + +$(PROG4): $(PROG4)$(O) $(OBJ4) + $(CC) -o $(VPATH)/$(PROG4) $(PROG4)$(O) $(OBJ4) $(CRYPTLIB) $(NSLLIB) + +$(PROG5): $(PROG5)$(O) $(OBJ5) + $(CC) -o $(VPATH)/$(PROG5) $(PROG5)$(O) $(OBJ5) $(CRYPTLIB) $(NSLLIB) + +$(PROG6): $(PROG6)$(O) $(OBJ6) + $(CC) -o $(VPATH)/$(PROG6) $(PROG6)$(O) $(OBJ6) $(NDBMLIB) $(CRYPTLIB) $(NSLLIB) + +$(PROG7): $(PROG7)$(O) $(OBJ7) + $(CC) -o $(VPATH)/$(PROG7) $(PROG7)$(O) $(OBJ7) $(CRYPTLIB) $(NSLLIB) + +$(PROG8): $(PROG8)$(O) $(OBJ8) + $(CC) -o $(VPATH)/$(PROG8) $(PROG8)$(O) $(OBJ8) $(NDBMLIB) $(CRYPTLIB) $(NSLLIB) + +$(PROG9): $(PROG9)$(O) $(OBJ9) + $(CC) -o $(VPATH)/$(PROG9) $(PROG9)$(O) $(OBJ9) $(CRYPTLIB) $(NSLLIB) + +$(HOBJ3): namspace.h connect.h nwvolume.h nwfile.h +$(HOBJ6): nwbind.h sema.h +$(OBJS): net.h config.h +$(PROG7)$(O): nwserv.c nwroute.c +tools$(O): $(DESTMAKEFILE) + +$(C)$(O): + $(CC) -c $(CFLAGS) $(HOSTCFLAGS) -D_VERS_H_=$(V_H) -D_VERS_L_=$(V_L) -D_VERS_P_=$(P_L) $< + + +n_all: $(PROGS) + @echo "don't forget to do a 'make install' as root !" >> $(VPATH)/.mk.notes + @echo "please take a look into doc/NEWS !" >> $(VPATH)/.mk.notes + @-head -n 5 $(VPATH)/doc/NEWS >> $(VPATH)/.mk.notes + +n_routed: $(PROG7) + +n_install_ini: + cd $(VPATH) && $(INSTALL) -m 664 nw.ini $(M_FILENAME_NW_INI) && cd $(OBJDIR) + +n_install: + cd $(VPATH) && $(INSTALL) -d $(M_PATHNAME_PROGS) && cd $(OBJDIR) + cd $(VPATH) && $(INSTALL) $(INSTALLPROGS) $(M_PATHNAME_PROGS) && cd $(OBJDIR) + @-if [ -r /sbin/nwserv ] && [ -r /usr/sbin/nwserv ] ; then echo "remove old version in /sbin ?" ; (cd /sbin && rm -i nwserv nwbind ncpserv nwconn nwclient nwrouted) ; fi ; + + + + @-if [ -r /etc/nwobj.pag ] ; then ( if [ ! -r $(M_PATHNAME_BINDERY) ] ; then if $(VPATH)/tools.sh yesno "move bindery files from /etc to $(M_PATHNAME_BINDERY) ?" ; then mkdir -p $(M_PATHNAME_BINDERY); (cd /etc && mv nwiobj.pag nwiobj.dir nwobj.pag nwobj.dir nwprop.pag nwprop.dir nwval.pag nwval.dir $(M_PATHNAME_BINDERY) ) ; fi; fi; ) fi ; +# 225 "makefile.c" + @cd $(VPATH) && (if [ -r $(M_FILENAME_NW_INI) ] ; then echo ""; echo "********************************************************"; echo ""; echo "$(M_FILENAME_NW_INI) exist."; echo "to overwrite it with nw.ini, make install_ini";echo ""; echo "********************************************************"; echo ""; else $(INSTALL) -m 664 nw.ini $(M_FILENAME_NW_INI); echo ""; echo "********************************************************"; echo ""; echo "$(M_FILENAME_NW_INI) created from nw.ini"; echo ""; echo "********************************************************"; echo ""; fi; echo "If you have problems, please read 'doc/BUGS' before"; echo "sending mail to mailinglist or me."; echo ""; echo "********************************************************"; cd $(OBJDIR) ) +# 250 "makefile.c" +n_reboot: n_install + -(nwserv -k ; nwserv)& + +clean_d: + cd $(VPATH) && ( find $(DISTRIB) \( -name .e.pck -o -name '~*' -o -name '*~' -o -name core \) -exec rm {} \; ; cd $(OBJDIR)) + +n_clean: + rm -f *.o + cd $(VPATH) && (rm -f $(PROGS) $(PROG7) ; rm -rf $(OBJDIR)/$(VPATH)/$(DISTRIB) ; cd $(OBJDIR) ) + +n_distclean: n_clean clean_d + cd $(VPATH) && (rm -f *.dir *.pag; cd $(OBJDIR)) + +make_dir: + cd $(VPATH) && (rm -rf $(OBJDIR)/$(VPATH)/$(DISTRIB) ; mkdir $(DISTRIB) ; mkdir $(DISTRIB)/examples ; mkdir $(DISTRIB)/doc ; ln -f $(STERN).[ch] makefile.unx tools.sh Makefile COPYING README $(DISTRIB)/. ; rm -f $(DISTRIB)/config.h ; ln -f examples/$(STERN) $(DISTRIB)/examples/. ; ln -f doc/$(STERN) $(DISTRIB)/doc/. ; cd $(OBJDIR) ) +# 290 "makefile.c" +n_diff: make_dir clean_d + cd $(VPATH) && ( $(MAKEPATCH) org/$(DISTRIB) $(DISTRIB) > $(PATCHF) ; gzip -9 -f $(PATCHF) ; cd $(OBJDIR) ) + +n_distrib: n_diff + -mkdir /tmp/x + cd $(VPATH) && ./mk_lsm "$(V_H).$(V_L).pl$(P_L)" $(DISTRIBF) && (tar cvzf $(DISTRIBF).tgz $(DISTRIB) ; uue $(DISTRIBF).tgz; mv -f $(DISTRIB)-$(V_H).uue $(DISTRIBF).uue ; cp -a $(DISTRIB)/doc/$(DISTRIB).lsm /tmp/yy ; echo "" >> /tmp/yy ; echo "" >> /tmp/yy ; cat $(DISTRIBF).uue >> /tmp/yy ; chmod 664 /tmp/yy ; rm $(DISTRIBF).uue ; mv $(DISTRIBF).tgz /tmp/x/. ; cp -a $(DISTRIB)/doc/$(DISTRIB).lsm /tmp/x/. ; mv $(PATCHF).gz /tmp/x/. ; cd $(OBJDIR) ) +# 311 "makefile.c" + -rm -f /tmp/mars_nwe.tgz + ln -s /tmp/x/$(DISTRIBF).tgz /tmp/mars_nwe.tgz + +n_distrib_bin: + cd $(VPATH) && (/usr/local/bin/cdar cb /tmp/mars_nwb.cda $(PROGS) examples doc ; cd $(OBJDIR)) + +n_bintgz: + cd $(VPATH) && (tar cvzf /tmp/mars_nwb.tgz $(PROGS) ; cd $(OBJDIR)) + +n_showconf: + echo "#" $(M_FILENAME_NW_INI) + grep "^[ \t]*[0-9]" $(M_FILENAME_NW_INI) diff -Naur mars_nwe/examples/mk.li mars-nwe-0.99-pl20-gentoo-patch/examples/mk.li --- mars_nwe/examples/mk.li 2000-01-15 16:11:20.000000000 +0500 +++ mars-nwe-0.99-pl20-gentoo-patch/examples/mk.li 2004-10-25 12:21:05.000000000 +0600 @@ -44,7 +44,7 @@ # CFLAGS="-pipe -O2 -fomit-frame-pointer" # problems gcc2.5.8 ^^^^^^^^^^^^^^^^^^^^^ # CFLAGS="-pipe -Wall -Dsignal=sysv_signal" - CFLAGS="$RPM_OPT_FLAGS -pipe -Wall -D_GNU_SOURCE" +# CFLAGS="$RPM_OPT_FLAGS -pipe -Wall -D_GNU_SOURCE" case $MASCHINE in sparc) diff -Naur mars_nwe/examples/nw.ini mars-nwe-0.99-pl20-gentoo-patch/examples/nw.ini --- mars_nwe/examples/nw.ini 2000-09-01 15:50:00.000000000 +0600 +++ mars-nwe-0.99-pl20-gentoo-patch/examples/nw.ini 2004-10-25 14:06:03.000000000 +0600 @@ -85,14 +85,14 @@ # every user, he can do it in two variants: # We suppose that the user test2 is logged in MARS_NWE. He has files # earlier stored in his homedirectory /home/test2. -# In case of entry 1 in /etc/nwserv.conf (naturally amongst other entries) +# In case of entry 1 in /etc/conf.d/nwroute (naturally amongst other entries) # there are other results of the MAP-command. # # Variant 1 Variant 2 # #DOS-Command MAP H:=MARS\HOMEDIR: MAP H:=MARS\HOMEDIR: # -#Entry in /etc/nwserv.conf +#Entry in /etc/conf.d/nwroute # 1 HOMEDIR ~ k 1 HOMEDIR /home k # #Result of DIR *.* All files stored in All homedirs of the @@ -159,7 +159,7 @@ # 1 WORLD /var/world kiO 777 666 # 1 FAXQ /var/spool/fax/faxqueue k - 1 SYS /u3/SYS/ kt 711 600 +# 1 SYS /u3/SYS/ kt 711 600 # ========================================================================= @@ -309,7 +309,7 @@ # 4 0x0 ppp0 AUTO 7 # auto detection of ppp0 interface. - 4 0x22 eth0 ethernet_ii 1 +# 4 0x22 eth0 ethernet_ii 1 4 0x0 * AUTO 1 # Section 5: special device flags @@ -342,7 +342,7 @@ # other flags may follow. # value will be interpreted as hex value. -5 0x0 +5 0x2 # ========================================================================= # Section 6: version-"spoofing" diff -Naur mars_nwe/examples/nwrouted mars-nwe-0.99-pl20-gentoo-patch/examples/nwrouted --- mars_nwe/examples/nwrouted 1970-01-01 05:00:00.000000000 +0500 +++ mars-nwe-0.99-pl20-gentoo-patch/examples/nwrouted 2004-10-25 15:05:17.000000000 +0600 @@ -0,0 +1,42 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ipx-utils/files/ipx.init,v 1.4 2004/07/15 00:00:43 agriffis Exp $ + +#NB: Config is in /etc/conf.d/nwrouted + +depend() { + use net + before ipx +} + +start() { + local retval=0 + + ebegin "Starting nwrouted" + /usr/sbin/nwrouted + retval=$(( $retval + $? )) + eend ${retval} "Failed to start nwrouted" +} + +stop() { + local retval=0 + + ebegin "Stopping nwrouted" + retval=$? + /usr/sbin/nwrouted -k + retval=$(( $retval + $? )) + eend ${retval} "Failed to stop nwrouted" +} + +restart() { + local retval=0 + + ebegin "Reloading nwrouted" + retval=$? + svc_stop + sleep 1 + svc_start + retval=$(( $retval + $? )) + eend ${retval} "Failed to reload nwrouted" +} diff -Naur mars_nwe/makefile.unx mars-nwe-0.99-pl20-gentoo-patch/makefile.unx --- mars_nwe/makefile.unx 2000-05-31 00:12:36.000000000 +0600 +++ mars-nwe-0.99-pl20-gentoo-patch/makefile.unx 2004-10-25 10:46:06.000000000 +0600 @@ -65,9 +65,7 @@ $(DESTMAKEFILE): $(VPATH)/makefile.unx $(VPATH)/config.h rm -f $@ - cp $(VPATH)/makefile.unx makefile.c - $(CPP) $(HOSTCFLAGS) -I$(VPATH) makefile.c > $@ - rm -f makefile.c + cp $(VPATH)/examples/Makefile.o Makefile.o #endif