From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Thu, 28 May 2009 14:21:56 +0000 (+0200)
Subject: lenny
X-Git-Tag: debian/6-24-1~3
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=jre-cn.git;a=commitdiff_plain;h=9eddb425c37cb933eaf69067e7cbe80fd3666ed3

lenny
---

diff --git a/README.CARNet b/README.CARNet
index c859229..7407a54 100644
--- a/README.CARNet
+++ b/README.CARNet
@@ -10,13 +10,13 @@ vlastiti kernel sa Grsecurity ili PAX zakrpama, za pocetak provjerite u
 procesa. Ukoliko postoje zapisi sa "grsec" ili "PAX" i pid-om java procesa
 pokusajte postaviti sljedece:
 
-chpax -rs /usr/lib/jvm/java-1.5.0-sun/jre/bin/*
+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-1.5.0-sun/jre/bin/java
+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,
@@ -26,7 +26,7 @@ upgrade kernel-cn paketa pregaziti izmjene u lilo.conf datoteci.)
 
 Ovaj paket kod instalacije postavlja 
 
-chpax -rs /usr/lib/jvm/java-1.5.0-sun/jre/bin/java
+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/),
diff --git a/debian/postinst b/debian/postinst
index 780cec3..676d423 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -43,7 +43,9 @@ if [ ! -x $libdir/bin/java ]; then
   exit 0
 fi
 
-if [ "$chpax" ] && \
-   ! $chpax -v $libdir/bin/java | egrep -q "flags for $libdir/bin/java \(...r.s\)"; then
-  $chpax -rs $libdir/bin/java
+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