diff --git a/NEWS b/NEWS index 2b6b4677..489b0ae1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ xbps-0.46 (???): + * /usr/sbin is now a symlink in void, don't consider it as obsolete and never + remove it even if it was detected as obsolete. + * xbps-rindex(1): use `-s, --sign` to initialize the repository archive with the required metadata to allow signed packages. Added `-S, --sign-pkg` to sign a specific package archive. This allows to sign a specific package, diff --git a/lib/package_find_obsoletes.c b/lib/package_find_obsoletes.c index 88cf713f..f9e4453f 100644 --- a/lib/package_find_obsoletes.c +++ b/lib/package_find_obsoletes.c @@ -80,6 +80,7 @@ xbps_find_pkg_obsoletes(struct xbps_handle *xhp, const char *basesymlinks[] = { "./bin", "./sbin", + "./usr/sbin", "./lib", "./lib32", "./lib64", diff --git a/lib/package_remove.c b/lib/package_remove.c index add657c1..a3d1741c 100644 --- a/lib/package_remove.c +++ b/lib/package_remove.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2009-2014 Juan Romero Pardines. + * Copyright (c) 2009-2015 Juan Romero Pardines. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -106,6 +106,7 @@ remove_pkg_files(struct xbps_handle *xhp, const char *basesymlinks[] = { "/bin", "/sbin", + "/usr/sbin", "/lib", "/lib32", "/lib64",