mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 14:20:33 -04:00
81ef7f54fd
rid of some local patches: o Fixed autocon warnings (Denis Leroy) o Ported to lame 3.100 (from Fedora) o G++ compile fixes (Nick Bailey) o Renamed xdao folder to gcdmaster (Denis Leroy) o pccts format security patch (from Fedora) o Fixed compile issues with glibc >= 2.12 o Gcdmaster segfault fix (Adrian Knoth) o Prevent a FTBFS on kfreebsd (Christoph Egger) o Fix printf format security issues (Frantisek Kluknavsky Fedora) o Add missing options to man page (Honza Horak) o CD_TEXT fix for HL-DT-ST (Kees Cook) o Man page hyphen fixes (Markus Koschany) o Some updates to the old scsilib smake files (Ubuntu patches) While at it, pet portlint. Security: yes
19 lines
661 B
C++
19 lines
661 B
C++
--- dao/main.cc.orig 2018-05-16 10:46:39 UTC
|
|
+++ dao/main.cc
|
|
@@ -2330,15 +2330,7 @@ int main(int argc, char **argv)
|
|
|
|
Settings* settings = new Settings;
|
|
|
|
- settingsPath = "/etc/cdrdao.conf";
|
|
- if (settings->read(settingsPath) == 0)
|
|
- log_message(3, "Read settings from \"%s\".", settingsPath);
|
|
-
|
|
- settingsPath = "/etc/defaults/cdrdao";
|
|
- if (settings->read(settingsPath) == 0)
|
|
- log_message(3, "Read settings from \"%s\".", settingsPath);
|
|
-
|
|
- settingsPath = "/etc/default/cdrdao";
|
|
+ settingsPath = "%%PREFIX%%/etc/cdrdao.conf";
|
|
if (settings->read(settingsPath) == 0)
|
|
log_message(3, "Read settings from \"%s\".", settingsPath);
|
|
|