izbacen chpax

diff --git a/README.CARNet b/README.CARNet
index 7407a54..fa6bd8b 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -1,36 +1,6 @@
 jre-cn
 ~~~~~~
 
-Java i Grsecurity
+Trenutno nista.
 
-Ukoliko se java aplikacije ruse sa SEGV ili KILL signalom, a imate
-instaliran stari CARNetov kernel-cn paket (novi koristi ExecShield) ili
-vlastiti kernel sa Grsecurity ili PAX zakrpama, za pocetak provjerite u
-/var/log/kernel.log da li grsec odn. PAX zaustavljaju izvrsenje java
-procesa. Ukoliko postoje zapisi sa "grsec" ili "PAX" i pid-om java procesa
-pokusajte postaviti sljedece:
-
-chpax -rs /usr/lib/jvm/java-6-sun/jre/bin/*
-
-Nakon toga provjerite je li se poboljsalo stanje aplikacije ili barem
-promijenio oblik greske.  Ako se aplikacije jos uvijek ne ponasa ispravno,
-pokusajte obrisati svu PAX zastitu:
-
-chpax -pemxsr /usr/lib/jvm/java-6-sun/jre/bin/java
-
-Ako ni tada aplikacija ne radi, preostaje mogucnost koristenja
-kernela bez Grsecurity zakrpe. U trenutnoj inacici kernel-cn paketa,
-taj se image zove "plain". (Ako budete mijenjali default= parametar
-u /etc/lilo.conf, ne zaboravite pokrenuti lilo. :) Imajte u vidu da ce
-upgrade kernel-cn paketa pregaziti izmjene u lilo.conf datoteci.)
-
-Ovaj paket kod instalacije postavlja 
-
-chpax -rs /usr/lib/jvm/java-6-sun/jre/bin/java
-
-sto je dovoljno za pokretanje klijentskih aplikacija poput
-LDAP Browser\Editor (http://www.iit.edu/~gawojar/ldap/),
-Azureus (http://azureus.sf.net) ili xnap (Debian paket).
-
- -- Zoran Dzelajlija <jelly+paketi@srce.hr>  Sun, 17 Oct 2004 03:09:01 +0200
- -- Ivan Rako <Ivan.Rako@CARNet.hr>  Thu, 28 May 2009 16:05:12 +0200
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 08 Jun 2011 18:05:52 +0200

diff --git a/debian/changelog b/debian/changelog
index efcd105..666eb11 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jre-cn (6-24-1) stable; urgency=low
 
   * Prva verzija za squeeze
+  * Izbacen chpax
 
  -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 13 Apr 2011 14:45:24 +0200
 

diff --git a/debian/control b/debian/control
index 73380a5..0872a4f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1
 
 Package: jre-cn
 Architecture: all
-Depends: sun-java6-jre, sun-java6-bin, sun-java6-fonts, chpax
+Depends: sun-java6-jre, sun-java6-bin, sun-java6-fonts
 Description: Sun Java(TM) Runtime Environment (JRE) 6 (architecture dependent files)
  The Sun Java Platform Standard Edition Runtime Environment (JRE) 6
  contains the Java virtual machine, runtime class libraries, and

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755 (executable)
index 676d423..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-set -e
-
-[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
-
-case "$1" in
-  configure)
-    # continue below
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-    exit 0
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 0
-  ;;
-esac
-
-libdir="/usr/lib/jvm/java-6-sun/jre"
-
-if [ -x /usr/sbin/chpax ]; then
-  chpax=/usr/sbin/chpax
-elif [ -x /sbin/chpax ]; then
-  chpax=/sbin/chpax
-elif uname -r | grep -q grsec; then
-  # no chpax found in default places
-  echo "Warning: Grsecurity kernel detected but no chpax found."
-  echo "Your java applications might not work until you run"
-  echo
-  echo "chpax -rs $libdir/bin/java"
-  echo
-  echo "Possibly even"
-  echo
-  echo "chpax -rs $libdir/bin/\*"
-  echo
-fi
-
-if [ ! -x $libdir/bin/java ]; then
-  echo "java not found in $libdir/bin. _Very_ strange."
-  exit 0
-fi
-
-if uname -r | grep -q grsec; then
-  if [ "$chpax" ] && \
-     ! $chpax -v $libdir/bin/java | egrep -q "flags for $libdir/bin/java \(...r.s\)"; then
-    $chpax -rs $libdir/bin/java
-  fi
-fi