diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2018-06-13 21:40:03 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2018-06-13 21:40:03 +0000 |
| commit | 81ef7f54fd4ec65295b40c558ae66ed1bfbefea3 (patch) | |
| tree | 21887bd0843f4a24add7e25837b264f8d51fa75e /sysutils/cdrdao/files/patch-dao_main.cc | |
| parent | mail/dovecot{,22} add BEFORE: mail to RC script (diff) | |
Update to 1.2.4, which is mostly a maintainance release and allows to get
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
Notes
Notes:
svn path=/head/; revision=472345
Diffstat (limited to 'sysutils/cdrdao/files/patch-dao_main.cc')
| -rw-r--r-- | sysutils/cdrdao/files/patch-dao_main.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sysutils/cdrdao/files/patch-dao_main.cc b/sysutils/cdrdao/files/patch-dao_main.cc new file mode 100644 index 000000000000..10f7027092f2 --- /dev/null +++ b/sysutils/cdrdao/files/patch-dao_main.cc @@ -0,0 +1,19 @@ +--- 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); + |