Browse files

Migrate /usr/sbin to /usr/bin following ArchLinux 20130603 update to

filesystem
  • Loading branch information...
1 parent f4e7c7c commit c1022b1c5c2fcb1ad676d33d3b47ab6339cb12b0 Jonathan Raffre committed Jun 7, 2013
View
16 ircd-hybrid-serv/PKGBUILD
@@ -29,12 +29,12 @@ source=("http://prdownloads.sourceforge.net/${_shortname}2/${_shortname}-${pkgve
"${pkgname}.service")
md5sums=("2163ca0c5d5d60ae39f3164e642fc4d4"
"d87abf82e4b612166646fb920aaeecf0"
- "a064971c990255fa74b062d152e648ae"
+ "059afe5e32c59b3ccc2fadedbe5f7ee0"
"742a7beae58a3a6e5918d7c7235d6159"
"25b1c8dd9700d79ba28282d154c65f32"
"95787fbf5edd46bfeb48c893d44a32e1"
- "3f38a5405b00500277d0aa58488cb61d"
- "cecaf9e565de07487b118bc5cfcf9aa2")
+ "61a6a1b67c432a1382429b9701ddd984"
+ "bfdb1e692f1b6bc6cf34f709e15b4f27")
build() {
cd "${srcdir}/${_shortname}"
@@ -55,7 +55,7 @@ build() {
--prefix=/usr \
--with-nicklen=${_nicklen} \
--with-topiclen=${_topiclen} \
- --bindir=/usr/sbin \
+ --bindir=/usr/bin \
--sysconfdir=/etc/ircd-hybrid \
--localstatedir=/var/log \
--mandir=/usr/share/man
@@ -72,8 +72,8 @@ package () {
# Install Hybserv extra binaries
- ln -fs /usr/sbin/hybserv ${pkgdir}/usr/sbin/showchans
- ln -fs /usr/sbin/hybserv ${pkgdir}/usr/sbin/shownicks
+ ln -fs /usr/bin/hybserv ${pkgdir}/usr/bin/showchans
+ ln -fs /usr/bin/hybserv ${pkgdir}/usr/bin/shownicks
# Install Hybserv manual pages
install -D -m 0644 ${srcdir}/${_shortname}/doc/hybserv.8 ${pkgdir}/usr/share/man/man8/hybserv.8
@@ -94,10 +94,10 @@ package () {
# Clean up
# - remove Hybserv obsolete binaries
- rm ${pkgdir}/usr/sbin/encrypt* ${pkgdir}/usr/sbin/finddupe ${pkgdir}/usr/sbin/servchk
+ rm ${pkgdir}/usr/bin/encrypt* ${pkgdir}/usr/bin/finddupe ${pkgdir}/usr/bin/servchk
# - remove Hybserv Debianized scripts, and redudant tools
- rm ${pkgdir}/usr/sbin/cleandb ${pkgdir}/usr/sbin/fixalvl ${pkgdir}/usr/sbin/mkpasswd
+ rm ${pkgdir}/usr/bin/cleandb ${pkgdir}/usr/bin/fixalvl ${pkgdir}/usr/bin/mkpasswd
# - remove manual pages from general purpose documentation
rm ${pkgdir}/usr/share/doc/${pkgname}/*.8
View
4 ircd-hybrid-serv/ircd-hybrid-serv.rc
@@ -5,7 +5,7 @@
. /etc/rc.d/functions
get_pid() {
- pidof -o %PPID /usr/sbin/hybserv
+ pidof -o %PPID /usr/bin/hybserv
}
case "$1" in
@@ -16,7 +16,7 @@ case "$1" in
PID=`get_pid`
if [ -z "$PID" ]; then
- su -c '/usr/sbin/hybserv' $HYBRID_USER &> /dev/null
+ su -c '/usr/bin/hybserv' $HYBRID_USER &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
exit 1
View
2 ircd-hybrid-serv/ircd-hybrid-serv.service
@@ -5,7 +5,7 @@ After=network.target remote-fs.target nss-lookup.target
[Service]
Type=forking
User=ircd
-ExecStart=/usr/sbin/hybserv
+ExecStart=/usr/bin/hybserv
[Install]
WantedBy=multi-user.target
View
2 ircd-hybrid-serv/makefile-fixes.patch
@@ -10,7 +10,7 @@ diff -Naur hybserv.orig/Makefile.in hybserv/Makefile.in
# Set this to the directory to install the hybserv binary
-BINDIR = $(PREFIX)/hybserv
-+BINDIR = $(PREFIX)/sbin
++BINDIR = $(PREFIX)/bin
# Set this to the directory to install hybserv.conf, motd.dcc, etc
-CONFDIR = $(PREFIX)/hybserv
View
7 ircd-hybrid/PKGBUILD
@@ -26,10 +26,10 @@ source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz"
"${pkgname}.tmpfiles")
md5sums=("8d83cfb5924bc51922464c91bdea1458"
"caad81bf8958943baf3b1bf6975e5f48"
- "54033f685fef4aa6e78072226f616a20"
+ "810727209194f9a7047e28d3488957e0"
"695fd1cc7417b1d8d45cfba982d5bbb8"
"26b5e5f8fdf52bb11025973d2431153b"
- "2d96623dd5307e1572478e0c0c32ca1b"
+ "d8381ecd7dd5ec4bb151db86527e374d"
"e51723ab29e7a3ddc3589846815de0c9")
@@ -42,7 +42,8 @@ build() {
# Configure Hybrid
./configure --prefix=/usr \
- --bindir=/usr/sbin \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
--sysconfdir=/etc/${pkgname} \
--localstatedir=/var \
--datarootdir=/usr/share \
View
4 ircd-hybrid/ircd-hybrid.rc
@@ -5,7 +5,7 @@
. /etc/rc.d/functions
get_pid() {
- pidof -o %PPID /usr/sbin/ircd
+ pidof -o %PPID /usr/bin/ircd
}
case "$1" in
@@ -16,7 +16,7 @@ case "$1" in
PID=`get_pid`
if [ -z "$PID" ]; then
- su -c '/usr/sbin/ircd $HYBRID_ARGS' $HYBRID_USER &> /dev/null
+ su -c '/usr/bin/ircd $HYBRID_ARGS' $HYBRID_USER &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
exit 1
View
2 ircd-hybrid/ircd-hybrid.service
@@ -6,7 +6,7 @@ After=network.target remote-fs.target nss-lookup.target
Type=forking
User=ircd
PIDFile=/var/run/ircd/ircd-hybrid.pid
-ExecStart=/usr/sbin/ircd -logfile /var/log/ircd/ircd.log -pidfile /var/run/ircd/ircd-hybrid.pid -configfile /etc/ircd-hybrid/ircd.conf
+ExecStart=/usr/bin/ircd -logfile /var/log/ircd/ircd.log -pidfile /var/run/ircd/ircd-hybrid.pid -configfile /etc/ircd-hybrid/ircd.conf
[Install]
WantedBy=multi-user.target

0 comments on commit c1022b1

Please sign in to comment.