diff options
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/gnunet.postinst | 22 | ||||
-rw-r--r-- | debian/libgnunet.install | 1 |
3 files changed, 12 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index 588fa4cf7..f38e54ccd 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -4,7 +4,7 @@ gnunet (0.14.0) unstable; urgency=medium | |||
4 | * Set option to log to /var/log/gnunet.log for logrotate to work as configured. | 4 | * Set option to log to /var/log/gnunet.log for logrotate to work as configured. |
5 | * Import into downstream repo. | 5 | * Import into downstream repo. |
6 | 6 | ||
7 | -- Christian Grothoff <grothoff@gnu.org> Tue 29 Dec 2020 12:02:10 AM CET | 7 | -- Christian Grothoff <grothoff@gnu.org> Tue, 29 Dec 2020 12:02:10 +0100 |
8 | 8 | ||
9 | gnunet (0.13.3-1) unstable; urgency=medium | 9 | gnunet (0.13.3-1) unstable; urgency=medium |
10 | 10 | ||
diff --git a/debian/gnunet.postinst b/debian/gnunet.postinst index 902b93fd7..07e5202e8 100644 --- a/debian/gnunet.postinst +++ b/debian/gnunet.postinst | |||
@@ -106,7 +106,7 @@ case "${1}" in | |||
106 | fi | 106 | fi |
107 | fi | 107 | fi |
108 | echo " done." | 108 | echo " done." |
109 | fi | 109 | fi |
110 | 110 | ||
111 | # Install GNUnet configuration for all users provided non exists | 111 | # Install GNUnet configuration for all users provided non exists |
112 | userlist=$(awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd) | 112 | userlist=$(awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd) |
@@ -117,9 +117,9 @@ case "${1}" in | |||
117 | for (( i=0; i<${#users[@]}; i++ )); do | 117 | for (( i=0; i<${#users[@]}; i++ )); do |
118 | usermod -aG gnunet ${users[$i]} | 118 | usermod -aG gnunet ${users[$i]} |
119 | if [ -n "$i" ] && [ -d "${homedirs[$i]}" ]; then | 119 | if [ -n "$i" ] && [ -d "${homedirs[$i]}" ]; then |
120 | mkdir -p ${homedirs[$i]}/.config/systemd/user/ | 120 | mkdir -p ${homedirs[$i]}/.config/systemd/user/ |
121 | 121 | ||
122 | cat > "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" << EOF | 122 | cat > "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" << EOF |
123 | # Copyright (C) 2019 GNUnet e.V. | 123 | # Copyright (C) 2019 GNUnet e.V. |
124 | # | 124 | # |
125 | # Copying and distribution of this file, with or without modification, | 125 | # Copying and distribution of this file, with or without modification, |
@@ -140,12 +140,11 @@ ExecStop=/usr/bin/gnunet-arm -e -c ${homedirs[$i]}/.config/gnunet.conf | |||
140 | WantedBy=multi-user.target | 140 | WantedBy=multi-user.target |
141 | EOF | 141 | EOF |
142 | 142 | ||
143 | chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" | 143 | chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" |
144 | if [ ! -f "${homedirs[$i]}/.config/gnunet.conf" ]; then | 144 | if [ ! -f "${homedirs[$i]}/.config/gnunet.conf" ]; then |
145 | mkdir -p ${homedirs[$i]}/.config/ | 145 | mkdir -p ${homedirs[$i]}/.config/ |
146 | cp /etc/skel/.config/gnunet.conf "${homedirs[$i]}/.config/gnunet.conf" | 146 | cp /etc/skel/.config/gnunet.conf "${homedirs[$i]}/.config/gnunet.conf" |
147 | chmod 644 "${homedirs[$i]}/.config/gnunet.conf" | 147 | chmod 644 "${homedirs[$i]}/.config/gnunet.conf" |
148 | chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/gnunet.conf" | ||
149 | fi | 148 | fi |
150 | fi | 149 | fi |
151 | port=$((8000+$(id -u "${users[$i]}"))) | 150 | port=$((8000+$(id -u "${users[$i]}"))) |
@@ -158,12 +157,13 @@ EOF | |||
158 | --rewrite \ | 157 | --rewrite \ |
159 | --section=gns-proxy \ | 158 | --section=gns-proxy \ |
160 | --option=OPTIONS \ | 159 | --option=OPTIONS \ |
161 | --value="-p $port" | 160 | --value="-p $port" |
161 | chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/gnunet.conf" | ||
162 | done | 162 | done |
163 | 163 | ||
164 | # Change the proxy settings for Firefox and Chromium if desired | 164 | # Change the proxy settings for Firefox and Chromium if desired |
165 | if ${_PROXY} | 165 | if ${_PROXY} |
166 | then | 166 | then |
167 | mkdir -p /etc/X11/xinit/xinitrc.d/ | 167 | mkdir -p /etc/X11/xinit/xinitrc.d/ |
168 | cat > "/etc/X11/xinit/xinitrc.d/80-gnunet-user-services" << "EOF" | 168 | cat > "/etc/X11/xinit/xinitrc.d/80-gnunet-user-services" << "EOF" |
169 | #!/bin/bash | 169 | #!/bin/bash |
@@ -219,7 +219,7 @@ fi | |||
219 | gnunet-gns-proxy-setup-ca | 219 | gnunet-gns-proxy-setup-ca |
220 | EOF | 220 | EOF |
221 | fi | 221 | fi |
222 | 222 | ||
223 | # Update files and directories permissions. | 223 | # Update files and directories permissions. |
224 | # Assuming default values, this *should* not be changed. | 224 | # Assuming default values, this *should* not be changed. |
225 | echo -n "Updating files and directories permissions:" | 225 | echo -n "Updating files and directories permissions:" |
diff --git a/debian/libgnunet.install b/debian/libgnunet.install index 14b47188c..60cdebea9 100644 --- a/debian/libgnunet.install +++ b/debian/libgnunet.install | |||
@@ -1,6 +1,5 @@ | |||
1 | usr/lib/*/*.so.* | 1 | usr/lib/*/*.so.* |
2 | usr/share/locale/ | 2 | usr/share/locale/ |
3 | usr/share/doc/libgnunet/ | ||
4 | usr/share/gnunet/config.d/ | 3 | usr/share/gnunet/config.d/ |
5 | usr/bin/gnunet-bugreport | 4 | usr/bin/gnunet-bugreport |
6 | usr/bin/gnunet-ecc | 5 | usr/bin/gnunet-ecc |