Ticket #2402: diff

File diff, 3.5 KB (added by mhatta, 4 months ago)
  • debian/changelog

    diff --git a/debian/changelog b/debian/changelog
    index f172c4f..576b62d 100644
    a b  
     1i2p (0.9.38-3) unstable; urgency=medium
     2
     3  * Improved handling of /usr/share/i2p/wrapper.config.
     4
     5 -- Masayuki Hatta <mhatta@debian.org>  Thu, 31 Jan 2019 09:33:18 +0900
     6
     7i2p (0.9.38-2) unstable; urgency=medium
     8
     9  * Now uses ucf for handling /etc/i2p/wrapper.config - closes: #920456
     10
     11 -- Masayuki Hatta <mhatta@debian.org>  Wed, 30 Jan 2019 13:24:34 +0900
     12
    113i2p (0.9.38-1) unstable; urgency=medium
    214
    315  * New upstream release.
  • debian/control

    diff --git a/debian/control b/debian/control
    index ac30a5a..5cee35f 100644
    a b Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, 
    3232 i2p-router (>= 0.8.6-5),
    3333 libjbigi-jni,
    3434 lsb-base,
    35  service-wrapper
     35 service-wrapper,
     36 ucf (>= 0.28)
    3637Description: Invisible Internet Project (I2P) - anonymous network
    3738 I2P is an anonymizing network, offering a simple layer that identity-sensitive
    3839 applications can use to securely communicate. All data is wrapped with several
  • debian/i2p.dirs

    diff --git a/debian/i2p.dirs b/debian/i2p.dirs
    index f693956..7d5ca85 100644
    a b  
     1etc/i2p
    12etc/apparmor.d/abstractions
  • debian/i2p.install

    diff --git a/debian/i2p.install b/debian/i2p.install
    index 314c225..396534a 100644
    a b  
    11pkg-temp/i2prouter usr/bin
    2 pkg-temp/wrapper.config etc/i2p
     2pkg-temp/wrapper.config usr/share/i2p
    33pkg-temp/locale usr/share/i2p
    44debian/apparmor/i2p etc/apparmor.d/abstractions
    55debian/apparmor/usr.bin.i2prouter etc/apparmor.d
  • debian/i2p.postinst

    diff --git a/debian/i2p.postinst b/debian/i2p.postinst
    index a063b84..6966db9 100755
    a b systemdservice="/lib/systemd/system/i2p.service" 
    1313. /usr/share/debconf/confmodule
    1414db_version 2.0
    1515
    16 
    1716case "$1" in
    1817    configure|reconfigure)
    1918        if [ ! -e $conffile ]; then
    case "$1" in 
    8281        fi
    8382
    8483        sed -e "s/^ *wrapper\.java\.maxmemory=.*/wrapper\.java\.maxmemory=$MEMORYLIMIT/" \
    85             < /etc/i2p/wrapper.config > /etc/i2p/wrapper.config.tmp
    86         mv -f /etc/i2p/wrapper.config.tmp /etc/i2p/wrapper.config
    87         chmod 0644 -f /etc/i2p/wrapper.config
    88 
     84            < /usr/share/i2p/wrapper.config > /usr/share/i2p/wrapper.config.tmp
     85        chmod 0644 -f /usr/share/i2p/wrapper.config.tmp
     86
     87    # Tell ucf that the file in /usr/share/i2p is the latest
     88    # maintainer version, and let it handle how to manage the real
     89    # confuguration file in /etc.
     90    # We can't use debian/i2p.ucf for now since dh_ucf doesn't support
     91    # --debconf-ok.
     92    ucf --debconf-ok /usr/share/i2p/wrapper.config.tmp /etc/i2p/wrapper.config
     93    ucfr i2p /etc/i2p/wrapper.config
     94    rm -f /usr/share/i2p/wrapper.config.tmp
     95   
    8996    # Older versions of adduser created the home directory.
    9097    # The version of adduser in Debian unstable does not.
    9198    [ -d $I2PHOME ] || mkdir -m0750 $I2PHOME
  • debian/i2p.postrm

    diff --git a/debian/i2p.postrm b/debian/i2p.postrm
    index 9aa4fd4..c1bec3e 100644
    a b if [ "$1" = "purge" ]; then 
    77        rm -rf /var/lib/i2p
    88        rm -rf /var/log/i2p
    99        rm -rf /etc/i2p
     10
     11        # clear it out from the ucf database
     12        if which ucf >/dev/null; then
     13            ucf --purge /etc/i2p/wrapper.config
     14        fi   
     15        if which ucfr >/dev/null; then
     16            ucfr --purge i2p /etc/i2p/wrapper.config
     17        fi   
    1018fi
    1119
    1220#DEBHELPER#