Imported Debian patch 0.5-4woody1

diff --git a/Makefile b/Makefile
index 83359e0bac4ef5ec7fb2c0428578100822208777..350adde1d83c1aa7388aafe39cec954237b6af48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ CC = gcc
 COPT = -O2
 CEXTRA = -DNDEBUG
 LEXTRA = 
-LFLAGS =  -lncurses -lnsl
+LFLAGS =  -lncurses -lnsl -ltermcap
 CFLAGS = $(CEXTRA) $(COPT)
 
 PROG = netris
@@ -73,171 +73,190 @@ cleandir: clean
 
 ##### DO NOT EDIT OR DELETE THIS LINE, it's needed by make depend #####
 game.o: game.c netris.h config.h /usr/include/getopt.h \
- /usr/include/memory.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/string.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
- /usr/include/bits/types.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/assert.h /usr/include/stdio.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/gnu/stubs.h /usr/include/bits/types.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/memory.h /usr/include/string.h /usr/include/sys/time.h \
+ /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/signal.h \
  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
- /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/netinet/in.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h proto.chg \
+ /usr/include/stdlib.h /usr/include/sys/types.h \
+ /usr/include/sys/sysmacros.h /usr/include/alloca.h \
+ /usr/include/netinet/in.h /usr/include/stdint.h \
+ /usr/include/bits/socket.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
- /usr/include/bits/posix2_lim.h /usr/include/stdint.h \
- /usr/include/bits/wordsize.h /usr/include/bits/socket.h \
- /usr/include/bits/sockaddr.h /usr/include/asm/socket.h \
- /usr/include/asm/sockios.h /usr/include/bits/in.h \
- /usr/include/bits/byteswap.h
+ /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
+ /usr/include/asm/socket.h /usr/include/asm/sockios.h \
+ /usr/include/bits/in.h /usr/include/bits/byteswap.h
 curses.o: curses.c netris.h config.h /usr/include/getopt.h \
- /usr/include/memory.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/string.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
- /usr/include/bits/types.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/assert.h /usr/include/stdio.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/gnu/stubs.h /usr/include/bits/types.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/memory.h /usr/include/string.h /usr/include/sys/time.h \
+ /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/signal.h \
  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
- /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
- /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h proto.chg \
+ /usr/include/sys/types.h /usr/include/sys/sysmacros.h \
  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
  /usr/include/bits/confname.h /usr/include/curses.h \
- /usr/include/unctrl.h /usr/include/stdlib.h /usr/include/alloca.h
+ /usr/include/ncurses_dll.h /usr/include/unctrl.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdbool.h \
+ /usr/include/stdlib.h /usr/include/alloca.h
 shapes.o: shapes.c netris.h config.h /usr/include/getopt.h \
- /usr/include/memory.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/string.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
- /usr/include/bits/types.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/assert.h /usr/include/stdio.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/gnu/stubs.h /usr/include/bits/types.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/memory.h /usr/include/string.h /usr/include/sys/time.h \
+ /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/signal.h \
  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
- /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
- /usr/include/alloca.h
+ /usr/include/bits/wordsize.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h proto.chg \
+ /usr/include/stdlib.h /usr/include/sys/types.h \
+ /usr/include/sys/sysmacros.h /usr/include/alloca.h
 board.o: board.c netris.h config.h /usr/include/getopt.h \
- /usr/include/memory.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/string.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
- /usr/include/bits/types.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/assert.h /usr/include/stdio.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/gnu/stubs.h /usr/include/bits/types.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/memory.h /usr/include/string.h /usr/include/sys/time.h \
+ /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/signal.h \
  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
- /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
- /usr/include/alloca.h
+ /usr/include/bits/wordsize.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h proto.chg \
+ /usr/include/stdlib.h /usr/include/sys/types.h \
+ /usr/include/sys/sysmacros.h /usr/include/alloca.h
 util.o: util.c netris.h config.h /usr/include/getopt.h \
- /usr/include/memory.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/string.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
- /usr/include/bits/types.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/assert.h /usr/include/stdio.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/gnu/stubs.h /usr/include/bits/types.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/memory.h /usr/include/string.h /usr/include/sys/time.h \
+ /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/signal.h \
  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
- /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
- /usr/include/alloca.h /usr/include/unistd.h \
- /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
- /usr/include/netdb.h /usr/include/rpc/netdb.h \
- /usr/include/sys/socket.h /usr/include/bits/socket.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h proto.chg \
+ /usr/include/stdlib.h /usr/include/sys/types.h \
+ /usr/include/sys/sysmacros.h /usr/include/alloca.h \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/confname.h /usr/include/netdb.h \
+ /usr/include/netinet/in.h /usr/include/stdint.h \
+ /usr/include/bits/socket.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
  /usr/include/asm/socket.h /usr/include/asm/sockios.h \
+ /usr/include/bits/in.h /usr/include/bits/byteswap.h \
+ /usr/include/rpc/netdb.h /usr/include/bits/netdb.h \
  /usr/include/errno.h /usr/include/bits/errno.h \
  /usr/include/linux/errno.h /usr/include/asm/errno.h
 inet.o: inet.c netris.h config.h /usr/include/getopt.h \
- /usr/include/memory.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/string.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
- /usr/include/bits/types.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/assert.h /usr/include/stdio.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/gnu/stubs.h /usr/include/bits/types.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/memory.h /usr/include/string.h /usr/include/sys/time.h \
+ /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/signal.h \
  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
- /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
- /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h proto.chg \
+ /usr/include/sys/types.h /usr/include/sys/sysmacros.h \
  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
  /usr/include/bits/confname.h /usr/include/stdlib.h \
  /usr/include/alloca.h /usr/include/sys/socket.h \
+ /usr/include/sys/uio.h /usr/include/bits/uio.h \
  /usr/include/bits/socket.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/limits.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/syslimits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/limits.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
  /usr/include/asm/socket.h /usr/include/asm/sockios.h \
  /usr/include/netinet/in.h /usr/include/stdint.h \
- /usr/include/bits/wordsize.h /usr/include/bits/in.h \
- /usr/include/bits/byteswap.h /usr/include/netdb.h \
- /usr/include/rpc/netdb.h /usr/include/errno.h \
+ /usr/include/bits/in.h /usr/include/bits/byteswap.h \
+ /usr/include/netdb.h /usr/include/rpc/netdb.h \
+ /usr/include/bits/netdb.h /usr/include/errno.h \
  /usr/include/bits/errno.h /usr/include/linux/errno.h \
  /usr/include/asm/errno.h
 robot.o: robot.c netris.h config.h /usr/include/getopt.h \
- /usr/include/memory.h /usr/include/features.h \
- /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
- /usr/include/string.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stddef.h \
- /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
- /usr/include/bits/types.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/sigset.h \
- /usr/include/assert.h /usr/include/stdio.h \
- /usr/lib/gcc-lib/i386-linux/2.95.1/include/stdarg.h \
- /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/ctype.h /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/gnu/stubs.h /usr/include/bits/types.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stddef.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/memory.h /usr/include/string.h /usr/include/sys/time.h \
+ /usr/include/time.h /usr/include/bits/time.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/assert.h /usr/include/stdio.h \
+ /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+ /usr/include/bits/wchar.h /usr/include/gconv.h \
+ /usr/lib/gcc-lib/i386-linux/2.95.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/signal.h \
  /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
- /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
- /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h proto.chg \
+ /usr/include/bits/wordsize.h /usr/include/bits/sigaction.h \
+ /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
+ /usr/include/bits/sigstack.h /usr/include/bits/sigthread.h proto.chg \
  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
  /usr/include/bits/confname.h /usr/include/stdlib.h \
- /usr/include/sys/types.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/sys/sysmacros.h \
- /usr/include/alloca.h /usr/include/ctype.h /usr/include/fcntl.h \
- /usr/include/bits/fcntl.h /usr/include/errno.h \
- /usr/include/bits/errno.h /usr/include/linux/errno.h \
- /usr/include/asm/errno.h
+ /usr/include/sys/types.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \
+ /usr/include/errno.h /usr/include/bits/errno.h \
+ /usr/include/linux/errno.h /usr/include/asm/errno.h
 version.o: version.c

diff --git a/debian/changelog b/debian/changelog
index 0bf43fb02deed20dbcbcb28ef1b4594bc795fa64..92766ab14f6aae5a0ab30405e51414d529097c1d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+netris (0.5-4woody1) stable-security; urgency=high
+
+  * Non-maintainer upload by the Security Team
+  * Apply patch from "Mark H. Weaver" <mhw@netris.org> to fix buffer overflow
+    in NetGenFunc (CAN-2003-0685)
+
+ -- Matt Zimmerman <mdz@debian.org>  Tue, 12 Aug 2003 22:16:21 -0400
+
+netris (0.5-4) unstable; urgency=medium
+
+  * wrote man page for netris-sample-robot, finally (closes: #19373)
+  * un-debhelper-ized the package.
+  * urgency=medium for having the libncurses4 removed from woody (previous
+    upload forgot to set urgency)
+
+ -- Gerfried Fuchs <alfie@debian.org>  Mon, 18 Feb 2002 12:59:56 +0100
+
+netris (0.5-3) unstable; urgency=low
+
+  * New Maintainer.
+  * Rebuild against libncurses5 (closes: #93943)
+  * Added manual page (thanks to Edward Betts for writing it) -- this doesn't
+    close 19373 though, netris-sample-robot still has no manual page.
+  * Removed emacs-junk from the end of this file.
+  * Updated to standards version 3.5.6:
+    * Fixed the pointer to the GPL in the copyright file.
+    * Added Build-Depends: debhelper, libncurses5-dev to control file.
+    * Binaries are stripped (closes: #127381)
+  * Added watch file.
+
+ -- Gerfried Fuchs <alfie@debian.org>  Mon, 11 Feb 2002 18:43:49 +0100
+
 netris (0.5-2) unstable; urgency=low
 
   * Change maintainer address
@@ -34,8 +66,3 @@ netris (0.4-1) unstable; urgency=low
   * Initial Release.
 
  -- Gergely Madarasz <gorgo@caesar.elte.hu>  Wed,  6 Aug 1997 22:10:42 +0200
-
-Local variables:
-mode: debian-changelog
-add-log-mailing-address: "gorgo@caesar.elte.hu"
-End:

diff --git a/debian/control b/debian/control
index 972a560459da2a94532415a4d445f48733a19781..d75cd56692f1107130cf5165a3a8e7623db21659 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: netris
 Section: games
 Priority: extra
-Maintainer: Gergely Madarasz <gorgo@sztaki.hu>
-Standards-Version: 3.0.1
+Maintainer: Gerfried Fuchs <alfie@debian.org>
+Build-Depends: libncurses5-dev
+Standards-Version: 3.5.6
 
 Package: netris
 Architecture: any

diff --git a/debian/copyright b/debian/copyright
index 82868fbc613dd47b70be372b85a0103b808cd50c..f61f2a18483c09ea502cf81f30edda202aa02970 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,4 +25,4 @@ Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licences/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL'.

diff --git a/debian/dirs b/debian/dirs
index 33359b8769910c20507e330f7655a58b40a3d546..1a413b86f6820cd6f3b602344f1f8246f9d6f700 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,3 @@
 usr/games
+usr/share/man/man6
+usr/share/doc/netris/examples

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..9c9991c
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+FAQ
+robot_desc

diff --git a/debian/examples b/debian/examples
new file mode 100644 (file)
index 0000000..9a7af8a
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+sr.c

diff --git a/debian/netris-sample-robot.6 b/debian/netris-sample-robot.6
new file mode 100644 (file)
index 0000000..f43a183
--- /dev/null
+++ b/debian/netris-sample-robot.6
@@ -0,0 +1,42 @@
+.TH netris-sample-robot 6 "16 Feb 2002" "0.5" "Netris Sample Robot"
+.SH "NAME"
+netris-sample-robot \- sample robot for netris
+.SH "SYNOPSIS"
+.B netris-sample-robot
+.RB [\| \-l \|]
+.SH "DESCRIPTION"
+The netris-sample-robot is a sample implementation of the robot protocol. It
+plays quite well but isn't too hard to beat. The robot should be started from
+netris with the option
+.B \-r
+to connect or wait for another player to join. You can also let two robots play
+against each other in that way, if you like.
+
+.SH "OPTIONS"
+.TP
+.B \-l
+Writes some log information into the file
+.B log
+in the current working directory. If it can't it bails out.
+
+.SH "EXAMPLES"
+.TP
+To start the netris-sample-robot waiting for another connection with logfile use the following line:
+netris -w -r 'netris-sample-robot -l'
+.P
+You then just have to start netris somewhere else which connects to that robot.
+
+.SH "SEE ALSO"
+.BR netris (6)
+
+.SH "BUGS"
+One known bug of the netris-sample-robot is that it hangs quite often. This was
+already filed as a bugreport against the package so please refrain from doing
+so again.  If you have an idea why this happens or know a solution how to fix
+it feel free to mail me.
+
+.SH "AUTHORS"
+Netris was written by Mark H. Weaver <mhw@netris.org>.
+
+This manual page was written by Gerfried Fuchs <alfie@debian.org> for
+the Debian GNU/Linux system (but may be used by others).

diff --git a/debian/netris.6 b/debian/netris.6
new file mode 100644 (file)
index 0000000..d75022c
--- /dev/null
+++ b/debian/netris.6
@@ -0,0 +1,93 @@
+.TH netris 6 "3 Aug 2001" "0.5" "Netris"
+.SH NAME
+netris \- networked version of tetris
+.SH SYNOPSIS
+.B netris
+.RB [\| \-wFDSCHR \|]
+.RB [\| \-c
+.IR host \|]
+.RB [\| \-p
+.IR port \|]
+.RB [\| \-k
+.IR keys \|]
+.RB [\| \-i
+.IR sec \|]
+.RB [\| \-r
+.IR robot \|]
+.RB [\| \-s
+.IR seed \|]
+.SH DESCRIPTION
+The object of the game Tetris is to fit the shapes together forming complete
+rows, which then vanish.  When the shapes fill up to the top, the game ends.
+This version of Tetris can be played against other people over a network.
+.SH OPTIONS
+.TP
+.B \-w
+Wait for connection from another host running netris.
+.TP
+.B \-c\  host
+Initiate connection to waiting netris running on
+.IR host .
+.TP
+.B \-p\  port
+Set the port number to use for connecting to netris, the default port is 9284.
+.TP
+.B \-k\  keys
+Remap keys, the argument is a prefix of the string containing the keys in
+order: left, rotate, right, drop, down-faster, toggle-spying, pause, faster,
+redraw. Use the "^" character to prefixes controls.  The default is to use
+"jkl mspf^l".
+.TP
+.B \-i\  sec
+Set the step-down interval, in seconds.
+.TP
+.B \-r\  robot
+Execute 
+.I robot
+(a command) as a robot controlling the game instead of the keyboard.
+.TP
+.B \-F
+Use fair robot interface.
+.TP
+.B \-s\  seed
+Start with given random seed.
+.TP
+.B \-D
+Drops go into drop mode, this means that sliding off a cliff after a drop
+causes
+another drop automatically.
+.TP
+.B \-S
+Disable inverse/bold/color for slow terminals.
+.TP
+.B \-C
+Disable color.
+.TP
+.B \-H
+Show distribution and warranty information.
+.TP
+.B \-R
+Show the rules of the game.
+.SH RULES
+.SS Two player mode
+It's just like normal Tetris except that when you clear more than one row with
+a single piece, the other player's board is moved up and junk rows are added
+to the bottom.  If you clear 2, 3 or 4 rows, 1, 2 or 4 junk rows are added to
+your opponent's board, respectively.  The junk rows have exactly one empty
+column.  For each group of junk rows given, the empty columns will line up.
+This is intentional.
+
+The longest surviving player wins the game.
+
+.SS One player mode
+This mode is currently very boring, because there's no scoring and it never
+gets any faster.  This will be rectified at some point.  I'm not very
+motivated to do it right now because I'm sick of one player Tetris.  For now,
+use the "f" key (by default) to make the game go faster.  Speed-ups cannot be
+reversed for the remainder of the game.
+
+.SH AUTHORS
+Netris was written by Mark H. Weaver <mhw@netris.org>.
+
+This manual page was written by Edward Betts <edward@debian.org>, for
+the Debian GNU/Linux system (but may be used by others).

diff --git a/debian/postinst b/debian/postinst
new file mode 100644 (file)
index 0000000..9a8b64f
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+
+if [ "$1" != configure ]; then
+       exit 0
+fi
+
+if [ -d /usr/doc -a ! -e /usr/doc/netris -a -d /usr/share/doc/netris ]; then
+       ln -sf ../share/doc/netris /usr/doc/netris
+fi
+
+if [ -x /usr/bin/update-menus ]; then
+       update-menus
+fi

diff --git a/debian/postrm b/debian/postrm
new file mode 100644 (file)
index 0000000..e3dd567
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+if [ -x /usr/bin/update-menus ]; then
+       update-menus
+fi

diff --git a/debian/prerm b/debian/prerm
new file mode 100644 (file)
index 0000000..977760d
--- /dev/null
+++ b/debian/prerm
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/netris ]; then
+       rm -f /usr/doc/netris
+fi

diff --git a/debian/rules b/debian/rules
index 2622a1db33c2faa65376ea06eae4871259279e94..58795f1d773e80374a858f1608ffab153eddf932 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,79 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+clean:
+       $(checkdir)
+       $(checkroot)
+       -rm -rf debian/netris debian/substvars debian/files \
+               build-stamp install-stamp
+       $(MAKE) clean
+
 
 build: build-stamp
 build-stamp:
-       dh_testdir
-
-       # Add here commands to compile the package.
+       $(checkdir)
        ./Configure -O2
        make
-
        touch build-stamp
 
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
 
-       # Add here commands to clean up after the build process.
-       $(MAKE) clean
+install: install-stamp
+install-stamp: build
+       $(checkdir)
+       $(checkroot)
+       -rm -rf debian/netris
+       mkdir -m755 debian/netris
+       cd debian/netris && mkdir -m755 -p `cat ../dirs`
+       install -o0 -g0 -m755 -p -s netris debian/netris/usr/games
+       install -o0 -g0 -m755 -p -s sr debian/netris/usr/games/netris-sample-robot
+       strip --remove-section=.comment --remove-section=.note \
+               debian/netris/usr/games/*
+       install -o0 -g0 -m644 -p debian/netris*.6 \
+               debian/netris/usr/share/man/man6
+       gzip -9 debian/netris/usr/share/man/man6/netris*.6
+       install -o0 -g0 -m644 -p `cat debian/docs` \
+               debian/netris/usr/share/doc/netris
+       install -o0 -g0 -m644 -p `cat debian/examples` \
+               debian/netris/usr/share/doc/netris/examples
+       gzip -9 debian/netris/usr/share/doc/netris/FAQ \
+               debian/netris/usr/share/doc/netris/robot_desc \
+               debian/netris/usr/share/doc/netris/examples/sr.c
+       touch install-stamp
 
-       dh_clean
 
 # Build architecture-independent files here.
 binary-indep: build
 # We have nothing to do by default.
+#
 
 # Build architecture-dependent files here.
-binary-arch: build
-       dh_testversion 2.0.40
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       # Add here commands to install the files into debian/tmp
-       install -s netris debian/tmp/usr/games
-       install -s sr debian/tmp/usr/games/netris-sample-robot
-
-       dh_installdocs FAQ robot_desc
-       dh_installexamples sr.c
-       dh_installmenu
-       dh_installmanpages
-       dh_undocumented netris.1 netris-sample-robot.1
-       dh_installchangelogs
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-source diff:                                                                  
-       @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary-arch: build install
+       $(checkdir)
+       $(checkroot)
+       mkdir -m755 -p debian/netris/DEBIAN debian/netris/usr/lib/menu
+       install -p -m644 debian/menu debian/netris/usr/lib/menu/netris
+       install -o0 -g0 -m644 -p debian/copyright \
+               debian/netris/usr/share/doc/netris
+       install -o0 -g0 -m644 -p debian/changelog \
+               debian/netris/usr/share/doc/netris/changelog.Debian
+       gzip -9 debian/netris/usr/share/doc/netris/changelog.Debian
+       install -o0 -g0 -m755 -p debian/postinst debian/postrm debian/prerm \
+               debian/netris/DEBIAN
+       dpkg-shlibdeps -Tdebian/substvars -dDepends \
+               debian/netris/usr/games/netris*
+       dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -pnetris \
+               -Pdebian/netris
+       cd debian/netris && find * -type f ! -regex '^DEBIAN/.*' -print0 | \
+               xargs -r0 md5sum > DEBIAN/md5sums
+       dpkg --build debian/netris ..
+
+
+define checkdir
+       test -f debian/rules
+endef
+
+define checkroot
+       test root = "`whoami`"
+endef
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean install binary-indep binary-arch binary

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..a613c58
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+# Site          Directory      Pattern               Version  Script
+ftp.netris.org  /pub/netris  netris-(.+)\\.tar\\.gz  debian  uupdate

diff --git a/inet.c b/inet.c
index dbfe7484f0d8b9bb2a65f956ce9afc7e9d979bb5..24993ab2fb73149045f361e3304e896d5fc7fca7 100644 (file)
--- a/inet.c
+++ b/inet.c
@@ -151,6 +151,9 @@ static MyEventType NetGenFunc(EventGenRec *gen, MyEvent *event)
        memcpy(data, netBuf, sizeof(data));
        type = ntoh2(data[0]);
        size = ntoh2(data[1]);
+       if (size >= sizeof(netBuf))
+               fatal("Received an invalid packet (too large), possibly an attempt\n"
+                         "  to exploit a vulnerability in versions before 0.52 !");
        netBufGoal = size;
        if (netBufSize < netBufGoal)
                return E_none;