[26969] in Source-Commits
/svn/athena r25862 - in trunk/debathena/debathena/ldso1-stub: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Mar 21 15:22:58 2013
Date: Thu, 21 Mar 2013 15:22:52 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201303211922.r2LJMqRe010345@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-03-21 15:22:52 -0400 (Thu, 21 Mar 2013)
New Revision: 25862
Added:
trunk/debathena/debathena/ldso1-stub/debian/control
trunk/debathena/debathena/ldso1-stub/ld-linux-1.asm
Removed:
trunk/debathena/debathena/ldso1-stub/debian/control.in
trunk/debathena/debathena/ldso1-stub/ld-linux-1.c
Modified:
trunk/debathena/debathena/ldso1-stub/Makefile
trunk/debathena/debathena/ldso1-stub/debian/changelog
trunk/debathena/debathena/ldso1-stub/debian/copyright
trunk/debathena/debathena/ldso1-stub/debian/debathena-ldso1-stub.lintian-overrides
trunk/debathena/debathena/ldso1-stub/debian/rules
Log:
In ldso1-stub:
* Write it in assembly, not C, because apparently C doesn't work. (Trac:
#476)
* Switch to copyright-format 1.0
* Switch to dh7 from CDBS
* Bump Standards-Version
Modified: trunk/debathena/debathena/ldso1-stub/Makefile
===================================================================
--- trunk/debathena/debathena/ldso1-stub/Makefile 2013-03-21 17:40:40 UTC (rev 25861)
+++ trunk/debathena/debathena/ldso1-stub/Makefile 2013-03-21 19:22:52 UTC (rev 25862)
@@ -1,13 +1,17 @@
+ASM=nasm
+LD=ld
+
all: ld-linux-1
-ld-linux-1: ld-linux-1.c
- $(CC) -static -fPIC -m32 -o ld-linux-1 ld-linux-1.c
+ld-linux-1: ld-linux-1.asm
+ $(ASM) -f elf ld-linux-1.asm
+ $(LD) -m elf_i386 -o ld-linux-1 ld-linux-1.o
install: all
install -d $(DESTDIR)/lib
install -m755 ld-linux-1 $(DESTDIR)/lib/ld-linux.so.1
clean:
- -rm ld-linux-1
+ -rm ld-linux-1 ld-linux-1.o
.PHONY: clean all
Modified: trunk/debathena/debathena/ldso1-stub/debian/changelog
===================================================================
--- trunk/debathena/debathena/ldso1-stub/debian/changelog 2013-03-21 17:40:40 UTC (rev 25861)
+++ trunk/debathena/debathena/ldso1-stub/debian/changelog 2013-03-21 19:22:52 UTC (rev 25862)
@@ -1,3 +1,13 @@
+debathena-ldso1-stub (1.1) unstable; urgency=low
+
+ * Write it in assembly, not C, because apparently C doesn't work. (Trac:
+ #476)
+ * Switch to copyright-format 1.0
+ * Switch to dh7 from CDBS
+ * Bump Standards-Version
+
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 21 Mar 2013 15:22:46 -0400
+
debathena-ldso1-stub (1.0) unstable; urgency=low
* Initial release. (Trac: #476)
Copied: trunk/debathena/debathena/ldso1-stub/debian/control (from rev 25844, trunk/debathena/debathena/ldso1-stub/debian/control.in)
===================================================================
--- trunk/debathena/debathena/ldso1-stub/debian/control (rev 0)
+++ trunk/debathena/debathena/ldso1-stub/debian/control 2013-03-21 19:22:52 UTC (rev 25862)
@@ -0,0 +1,18 @@
+Source: debathena-ldso1-stub
+Section: debathena/libs
+Priority: extra
+Maintainer: Debathena Project <debathena@mit.edu>
+Build-Depends: debhelper (>= 7.0.50~), nasm
+Standards-Version: 3.9.3
+
+Package: debathena-ldso1-stub
+Architecture: i386 amd64
+Depends: ${misc:Depends}
+Provides: ldso
+Conflicts: ldso
+Replaces: ldso
+Description: Stub program interpreter (ld-linux.so.1) for old binaries
+ There's a good amount of old Linux software in Athena lockers
+ compiled against libc5, which uses /lib/ld-linux.so.1 as its program
+ interpreter. This package provides a stub version of that interpreter
+ that prints a helpful error message and exits.
Modified: trunk/debathena/debathena/ldso1-stub/debian/copyright
===================================================================
--- trunk/debathena/debathena/ldso1-stub/debian/copyright 2013-03-21 17:40:40 UTC (rev 25861)
+++ trunk/debathena/debathena/ldso1-stub/debian/copyright 2013-03-21 19:22:52 UTC (rev 25862)
@@ -1,32 +1,25 @@
-This package was created as part of the Debathena Project
-<http://debathena.mit.edu/> of the MIT Student Information Processing
-Board.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-The source code was obtained from the Athena SVN repository at
-<svn://debathena.mit.edu/athena/trunk/debathena/debathena>, and is
-licensed as follows:
-
- Copyright © 2009, 2012 Geoffrey Thomas <geofft@mit.edu>
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-The Debian packaging is Copyright © 2012 Geoffrey Thomas, and has the same
-license as the original software.
+Files: *
+Copyright: © 2009, 2012 Geoffrey Thomas <geofft@mit.edu>
+ (c) 2013 Massachusetts Institute of Technology
+License: Expat
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
Modified: trunk/debathena/debathena/ldso1-stub/debian/debathena-ldso1-stub.lintian-overrides
===================================================================
--- trunk/debathena/debathena/ldso1-stub/debian/debathena-ldso1-stub.lintian-overrides 2013-03-21 17:40:40 UTC (rev 25861)
+++ trunk/debathena/debathena/ldso1-stub/debian/debathena-ldso1-stub.lintian-overrides 2013-03-21 19:22:52 UTC (rev 25862)
@@ -1,2 +1,3 @@
# That's the point.
statically-linked-binary lib/ld-linux.so.1
+unstripped-binary-or-object lib/ld-linux.so.1
Modified: trunk/debathena/debathena/ldso1-stub/debian/rules
===================================================================
--- trunk/debathena/debathena/ldso1-stub/debian/rules 2013-03-21 17:40:40 UTC (rev 25861)
+++ trunk/debathena/debathena/ldso1-stub/debian/rules 2013-03-21 19:22:52 UTC (rev 25862)
@@ -1,10 +1,7 @@
#!/usr/bin/make -f
-DEB_MAKE_CLEAN_TARGET = clean
-DEB_MAKE_BUILD_TARGET = all
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
+%:
+ dh $@
-DEB_DH_FIXPERMS_ARGS := -Xld-linux.so.1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+override_dh_fixperms:
+ dh_fixperms -Xldlinux.so.1
Added: trunk/debathena/debathena/ldso1-stub/ld-linux-1.asm
===================================================================
--- trunk/debathena/debathena/ldso1-stub/ld-linux-1.asm (rev 0)
+++ trunk/debathena/debathena/ldso1-stub/ld-linux-1.asm 2013-03-21 19:22:52 UTC (rev 25862)
@@ -0,0 +1,19 @@
+section .text
+global _start
+
+_start:
+
+ mov edx,len
+ mov ecx,msg
+ mov ebx,2
+ mov eax,4
+ int 0x80
+
+ mov ebx,1
+ mov eax,1
+ int 0x80
+
+section .data
+
+msg db 'ERROR: The program you are trying to run is too old for this system.',0xa,' (libc5 not available)',0xa,0x0
+len equ $ - msg
