[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#301266: Always advertises "Debian GNU/Linux"



Package: apache2
Severity: wishlist
Tags: patch

Hi!

The Server banner in apache2 always advertises as "Debian GNU/Linux"
regardless of the system we're running apache2 on.

I'm attaching a patch that fixes this by detecting the kernel via uname in
debian/rules and passing it as a -D flag.

-- System Information:
Debian Release: 3.1
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-i386 (i686)
Kernel: GNU/kFreeBSD 5.3-5
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C)
diff -ur apache2-2.0.53.old/debian/patches/007_debian_advertising apache2-2.0.53/debian/patches/007_debian_advertising
--- apache2-2.0.53.old/debian/patches/007_debian_advertising	2005-03-24 12:19:11.000000000 +0100
+++ apache2-2.0.53/debian/patches/007_debian_advertising	2005-03-24 12:21:57.000000000 +0100
@@ -5,7 +5,7 @@
      }
      else {
 -        ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (" PLATFORM ")");
-+        ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (Debian GNU/Linux)");
++        ap_add_version_component(pconf, AP_SERVER_BASEVERSION " (Debian GNU/" KERNEL ")");
      }
  
      /*
diff -ur apache2-2.0.53.old/debian/rules apache2-2.0.53/debian/rules
--- apache2-2.0.53.old/debian/rules	2005-03-24 12:19:11.000000000 +0100
+++ apache2-2.0.53/debian/rules	2005-03-24 16:09:17.000000000 +0100
@@ -55,7 +55,7 @@
 		--enable-file-cache=shared --enable-cache=shared \
 		--enable-disk-cache=shared --enable-mem-cache=shared 
 
-AP2_CONFLAGS = $(CFLAGS) -pipe -I/usr/include/xmltok -I/usr/include/openssl -Wall
+AP2_CONFLAGS = $(CFLAGS) -pipe -I/usr/include/xmltok -I/usr/include/openssl -Wall -DKERNEL=`uname -s | sed -e s,GNU/,,g -e s,GNU,Hurd,g`
 #AP2_CONFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 
 AP2_LDFLAGS = -ldl -lexpat -lcrypt -ldb-4.2
 

Reply to: