Hello community, here is the log from the commit of package blogc for openSUSE:Factory checked in at 2019-04-23 14:37:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blogc (Old) and /work/SRC/openSUSE:Factory/.blogc.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blogc" Tue Apr 23 14:37:14 2019 rev:14 rq:696967 version:0.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/blogc/blogc.changes 2019-04-15 11:54:08.590625351 +0200 +++ /work/SRC/openSUSE:Factory/.blogc.new.5536/blogc.changes 2019-04-23 14:37:21.057523343 +0200 @@ -1,0 +2,7 @@ +Tue Apr 23 06:02:56 UTC 2019 - mvet...@suse.com + +- Update to 0.16.1: + * blogc-make(1) was implementing atom feeds wrong for long time. + * atom_legacy_entry_id isn't supported by blogcfile(5) anymore. + +------------------------------------------------------------------- Old: ---- blogc-0.16.0.tar.xz New: ---- blogc-0.16.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blogc.spec ++++++ --- /var/tmp/diff_new_pack.Xbpwpw/_old 2019-04-23 14:37:23.133524528 +0200 +++ /var/tmp/diff_new_pack.Xbpwpw/_new 2019-04-23 14:37:23.133524528 +0200 @@ -17,7 +17,7 @@ Name: blogc -Version: 0.16.0 +Version: 0.16.1 Release: 0 Summary: Blog compiler License: BSD-3-Clause ++++++ blogc-0.16.0.tar.xz -> blogc-0.16.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/.tarball-version new/blogc-0.16.1/.tarball-version --- old/blogc-0.16.0/.tarball-version 2019-04-13 21:21:50.000000000 +0200 +++ new/blogc-0.16.1/.tarball-version 2019-04-21 20:03:18.000000000 +0200 @@ -1 +1 @@ -0.16.0 +0.16.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/.version new/blogc-0.16.1/.version --- old/blogc-0.16.0/.version 2019-04-13 21:21:49.000000000 +0200 +++ new/blogc-0.16.1/.version 2019-04-21 20:03:17.000000000 +0200 @@ -1 +1 @@ -0.16.0 +0.16.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/blogc.spec new/blogc-0.16.1/blogc.spec --- old/blogc-0.16.0/blogc.spec 2019-04-13 21:21:48.000000000 +0200 +++ new/blogc-0.16.1/blogc.spec 2019-04-21 20:03:16.000000000 +0200 @@ -1,11 +1,11 @@ Name: blogc -Version: 0.16.0 +Version: 0.16.1 Release: 1%{?dist} License: BSD Group: Applications/Text Summary: A blog compiler URL: https://blogc.rgm.io/ -Source0: https://github.com/blogc/blogc/releases/download/v0.16.0/blogc-0.16.0.tar.xz +Source0: https://github.com/blogc/blogc/releases/download/v0.16.1/blogc-0.16.1.tar.xz BuildRequires: gcc, libcmocka-devel, bash, coreutils, diffutils %if ! 0%{?el6} BuildRequires: git, tar, make @@ -43,7 +43,7 @@ blogc-runserver is a simple HTTP server to test blogc websites. %prep -%setup -q -n blogc-0.16.0 +%setup -q -n blogc-0.16.1 %build %if 0%{?el6} @@ -88,6 +88,9 @@ %license LICENSE %changelog +* Sun Apr 21 2019 Rafael G. Martins <raf...@rafaelmartins.eng.br> 0.16.1-1 +- New release. + * Sat Apr 13 2019 Rafael G. Martins <raf...@rafaelmartins.eng.br> 0.16.0-1 - New release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/blogc.spec.in new/blogc-0.16.1/blogc.spec.in --- old/blogc-0.16.0/blogc.spec.in 2019-04-13 21:21:12.000000000 +0200 +++ new/blogc-0.16.1/blogc.spec.in 2019-04-21 20:02:43.000000000 +0200 @@ -88,6 +88,9 @@ %license LICENSE %changelog +* Sun Apr 21 2019 Rafael G. Martins <raf...@rafaelmartins.eng.br> 0.16.1-1 +- New release. + * Sat Apr 13 2019 Rafael G. Martins <raf...@rafaelmartins.eng.br> 0.16.0-1 - New release. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/blogcfile.5 new/blogc-0.16.1/blogcfile.5 --- old/blogc-0.16.0/blogcfile.5 2019-04-13 21:21:49.000000000 +0200 +++ new/blogc-0.16.1/blogcfile.5 2019-04-21 20:03:17.000000000 +0200 @@ -47,9 +47,6 @@ \fBatom_ext\fR (default: \fB\.xml\fR): The extension of the generated Atom feeds\. . .IP "\(bu" 4 -\fBatom_legacy_entry_id\fR (default: \fBfalse\fR): Before \fB0\.14\.0\fR blogc\-make(1) was generating "broken" entry IDs in the atom feeds\. This behavior was fixed in version \fB0\.14\.0\fR and current users that don\'t want to have their old posts re\-shared due to the change of IDs should set this to \fBtrue\fR, to keep using the old format\. -. -.IP "\(bu" 4 \fBatom_order\fR (default: \fBDESC\fR): The ordering (\fBASC\fR or \fBDESC\fR) of the Atom feeds\. Please note that the files are not sorted by date, they are sorted by their order in the \fB[posts]\fR section\. . .IP "\(bu" 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/configure new/blogc-0.16.1/configure --- old/blogc-0.16.0/configure 2019-04-13 21:21:42.000000000 +0200 +++ new/blogc-0.16.1/configure 2019-04-21 20:03:11.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for blogc 0.16.0. +# Generated by GNU Autoconf 2.69 for blogc 0.16.1. # # Report bugs to <https://github.com/blogc/blogc>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='blogc' PACKAGE_TARNAME='blogc' -PACKAGE_VERSION='0.16.0' -PACKAGE_STRING='blogc 0.16.0' +PACKAGE_VERSION='0.16.1' +PACKAGE_STRING='blogc 0.16.1' PACKAGE_BUGREPORT='https://github.com/blogc/blogc' PACKAGE_URL='https://blogc.rgm.io/' @@ -1396,7 +1396,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures blogc 0.16.0 to adapt to many kinds of systems. +\`configure' configures blogc 0.16.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1467,7 +1467,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of blogc 0.16.0:";; + short | recursive ) echo "Configuration of blogc 0.16.1:";; esac cat <<\_ACEOF @@ -1599,7 +1599,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -blogc configure 0.16.0 +blogc configure 0.16.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1968,7 +1968,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by blogc $as_me 0.16.0, which was +It was created by blogc $as_me 0.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2833,7 +2833,7 @@ # Define the identity of the package. PACKAGE='blogc' - VERSION='0.16.0' + VERSION='0.16.1' cat >>confdefs.h <<_ACEOF @@ -15509,7 +15509,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by blogc $as_me 0.16.0, which was +This file was extended by blogc $as_me 0.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15576,7 +15576,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -blogc config.status 0.16.0 +blogc config.status 0.16.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/man/blogcfile.5.ronn new/blogc-0.16.1/man/blogcfile.5.ronn --- old/blogc-0.16.0/man/blogcfile.5.ronn 2019-04-13 21:21:12.000000000 +0200 +++ new/blogc-0.16.1/man/blogcfile.5.ronn 2019-04-21 20:02:43.000000000 +0200 @@ -43,12 +43,6 @@ * `atom_ext` (default: `.xml`): The extension of the generated Atom feeds. - * `atom_legacy_entry_id` (default: `false`): - Before `0.14.0` blogc-make(1) was generating "broken" entry IDs in the atom feeds. - This behavior was fixed in version `0.14.0` and current users that don't want - to have their old posts re-shared due to the change of IDs should set this to - `true`, to keep using the old format. - * `atom_order` (default: `DESC`): The ordering (`ASC` or `DESC`) of the Atom feeds. Please note that the files are not sorted by date, they are sorted by their order in the `[posts]` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/src/blogc-make/atom.c new/blogc-0.16.1/src/blogc-make/atom.c --- old/blogc-0.16.0/src/blogc-make/atom.c 2019-04-13 21:21:12.000000000 +0200 +++ new/blogc-0.16.1/src/blogc-make/atom.c 2019-04-21 20:02:43.000000000 +0200 @@ -21,7 +21,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{%% ifdef FILTER_TAG %%} - " "{{ FILTER_TAG }}{%% endif %%}</title>\n" - " <id>{{ BASE_URL }}%s</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}%s</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}%s\" rel=\"self\" />\n" @@ -33,7 +33,7 @@ " {%% block listing %%}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}%s</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}%s</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}%s\" />\n" @@ -75,21 +75,11 @@ char *post_url = bm_generate_filename(NULL, post_prefix, "{{ FILENAME }}", post_ext); - char *entry_id = NULL; - if (bc_str_to_bool(bc_trie_lookup(settings->settings, "atom_legacy_entry_id"))) { - entry_id = bc_strdup_printf("%s%s/{{ FILENAME }}/", - post_prefix[0] == '\0' ? "" : "/", post_prefix); - } - else { - entry_id = bc_strdup(post_url); - } - char *rv = bc_strdup_printf(atom_template, atom_url->str, atom_url->str, - entry_id, post_url); + post_url, post_url); bc_string_free(atom_url, true); free(post_url); - free(entry_id); return rv; } @@ -101,6 +91,13 @@ if (settings == NULL || err == NULL || *err != NULL) return NULL; + if (NULL != bc_trie_lookup(settings->settings, "atom_legacy_entry_id")) { + *err = bc_error_new_printf(BLOGC_MAKE_ERROR_ATOM, + "'atom_legacy_entry_id' setting is not supported anymore. see " + "https://blogc.rgm.io/news/blogc-0.16.1/ for details"); + return NULL; + } + // this is not really portable char fname[] = "/tmp/blogc-make_XXXXXX"; int fd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/tests/blogc-make/check_atom.c new/blogc-0.16.1/tests/blogc-make/check_atom.c --- old/blogc-0.16.0/tests/blogc-make/check_atom.c 2019-04-13 21:21:12.000000000 +0200 +++ new/blogc-0.16.1/tests/blogc-make/check_atom.c 2019-04-21 20:02:43.000000000 +0200 @@ -40,7 +40,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% else %}/index{% endif %}.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -54,7 +54,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/{{ FILENAME }}.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}.html\" />\n" @@ -92,7 +92,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% endif %}/index.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -106,7 +106,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/{{ FILENAME }}/index.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}/index.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}/index.html\" />\n" @@ -144,7 +144,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% endif %}.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -158,7 +158,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/post/{{ FILENAME }}.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}.html\" />\n" @@ -196,7 +196,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% endif %}/index.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -210,7 +210,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/post/{{ FILENAME }}/index.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/index.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/index.html\" />\n" @@ -256,7 +256,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% else %}/index{% endif %}.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -270,7 +270,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/{{ FILENAME }}.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}.html\" />\n" @@ -318,7 +318,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% endif %}/index.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -332,7 +332,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/{{ FILENAME }}/index.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}/index.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}/index.html\" />\n" @@ -380,7 +380,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% endif %}.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -394,7 +394,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/post/{{ FILENAME }}.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}.html\" />\n" @@ -442,7 +442,7 @@ "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" "{% endif %}/index.xml</id>\n" " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" @@ -456,7 +456,7 @@ " {% block listing %}\n" " <entry>\n" " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/post/{{ FILENAME }}/index.html</id>\n" + " <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/index.html</id>\n" " <updated>{{ DATE_FORMATTED }}</updated>\n" " <published>{{ DATE_FORMATTED }}</published>\n" " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/index.html\" />\n" @@ -491,50 +491,15 @@ bc_error_t *err = NULL; char *rv = bm_atom_deploy(settings, &err); - assert_non_null(rv); - assert_null(err); - - size_t cmp_len; - char *cmp = bc_file_get_contents(rv, true, &cmp_len, &err); + assert_null(rv); + assert_non_null(err); - assert_non_null(cmp); - assert_null(err); - - assert_string_equal(cmp, - "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" - "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " - "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" - "{% else %}/index{% endif %}.xml</id>\n" - " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" - " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" - " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}{% ifdef FILTER_TAG %}" - "/{{ FILTER_TAG }}{% else %}/index{% endif %}.xml\" rel=\"self\" />\n" - " <author>\n" - " <name>{{ AUTHOR_NAME }}</name>\n" - " <email>{{ AUTHOR_EMAIL }}</email>\n" - " </author>\n" - " <subtitle type=\"text\">{{ SITE_TAGLINE }}</subtitle>\n" - " {% block listing %}\n" - " <entry>\n" - " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/{{ FILENAME }}/</id>\n" - " <updated>{{ DATE_FORMATTED }}</updated>\n" - " <published>{{ DATE_FORMATTED }}</published>\n" - " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/{{ FILENAME }}.html\" />\n" - " <author>\n" - " <name>{{ AUTHOR_NAME }}</name>\n" - " <email>{{ AUTHOR_EMAIL }}</email>\n" - " </author>\n" - " <content type=\"html\"><![CDATA[{{ CONTENT }}]]></content>\n" - " </entry>\n" - " {% endblock %}\n" - "</feed>\n"); + assert_int_equal(err->type, BLOGC_MAKE_ERROR_ATOM); + assert_string_equal(err->msg, + "'atom_legacy_entry_id' setting is not supported anymore. see " + "https://blogc.rgm.io/news/blogc-0.16.1/ for details"); - free(cmp); - bm_atom_destroy(rv); - free(rv); + bc_error_free(err); bc_trie_free(settings->settings); free(settings); } @@ -554,50 +519,15 @@ bc_error_t *err = NULL; char *rv = bm_atom_deploy(settings, &err); - assert_non_null(rv); - assert_null(err); - - size_t cmp_len; - char *cmp = bc_file_get_contents(rv, true, &cmp_len, &err); + assert_null(rv); + assert_non_null(err); - assert_non_null(cmp); - assert_null(err); - - assert_string_equal(cmp, - "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" - "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - " - "{{ FILTER_TAG }}{% endif %}</title>\n" - " <id>{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}" - "{% endif %}.xml</id>\n" - " <updated>{{ DATE_FIRST_FORMATTED }}</updated>\n" - " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/\" />\n" - " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/atom{% ifdef FILTER_TAG %}" - "/{{ FILTER_TAG }}{% endif %}.xml\" rel=\"self\" />\n" - " <author>\n" - " <name>{{ AUTHOR_NAME }}</name>\n" - " <email>{{ AUTHOR_EMAIL }}</email>\n" - " </author>\n" - " <subtitle type=\"text\">{{ SITE_TAGLINE }}</subtitle>\n" - " {% block listing %}\n" - " <entry>\n" - " <title type=\"text\">{{ TITLE }}</title>\n" - " <id>{{ BASE_URL }}/post/{{ FILENAME }}/</id>\n" - " <updated>{{ DATE_FORMATTED }}</updated>\n" - " <published>{{ DATE_FORMATTED }}</published>\n" - " <link href=\"{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}.html\" />\n" - " <author>\n" - " <name>{{ AUTHOR_NAME }}</name>\n" - " <email>{{ AUTHOR_EMAIL }}</email>\n" - " </author>\n" - " <content type=\"html\"><![CDATA[{{ CONTENT }}]]></content>\n" - " </entry>\n" - " {% endblock %}\n" - "</feed>\n"); + assert_int_equal(err->type, BLOGC_MAKE_ERROR_ATOM); + assert_string_equal(err->msg, + "'atom_legacy_entry_id' setting is not supported anymore. see " + "https://blogc.rgm.io/news/blogc-0.16.1/ for details"); - free(cmp); - bm_atom_destroy(rv); - free(rv); + bc_error_free(err); bc_trie_free(settings->settings); free(settings); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blogc-0.16.0/tests/blogc-make/check_blogc_make.sh.in new/blogc-0.16.1/tests/blogc-make/check_blogc_make.sh.in --- old/blogc-0.16.0/tests/blogc-make/check_blogc_make.sh.in 2019-04-13 21:21:12.000000000 +0200 +++ new/blogc-0.16.1/tests/blogc-make/check_blogc_make.sh.in 2019-04-21 20:02:43.000000000 +0200 @@ -99,7 +99,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/atom.xml</id> + <id>http://example.org/atom.xml</id> <updated>2016-09-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atom.xml" rel="self" /> @@ -111,7 +111,7 @@ <entry> <title type="text">Bar</title> - <id>/post/bar/index.html</id> + <id>http://example.org/post/bar/index.html</id> <updated>2016-09-01T00:00:00Z</updated> <published>2016-09-01T00:00:00Z</published> <link href="http://example.org/post/bar/index.html" /> @@ -125,7 +125,7 @@ <entry> <title type="text">Foo</title> - <id>/post/foo/index.html</id> + <id>http://example.org/post/foo/index.html</id> <updated>2016-10-01T00:00:00Z</updated> <published>2016-10-01T00:00:00Z</published> <link href="http://example.org/post/foo/index.html" /> @@ -243,7 +243,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/atom.xml</id> + <id>http://example.org/atom.xml</id> <updated>2016-09-11T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atom.xml" rel="self" /> @@ -255,7 +255,7 @@ <entry> <title type="text">Post 11</title> - <id>/post/post11/index.html</id> + <id>http://example.org/post/post11/index.html</id> <updated>2016-09-11T00:00:00Z</updated> <published>2016-09-11T00:00:00Z</published> <link href="http://example.org/post/post11/index.html" /> @@ -269,7 +269,7 @@ <entry> <title type="text">Post 10</title> - <id>/post/post10/index.html</id> + <id>http://example.org/post/post10/index.html</id> <updated>2016-09-10T00:00:00Z</updated> <published>2016-09-10T00:00:00Z</published> <link href="http://example.org/post/post10/index.html" /> @@ -283,7 +283,7 @@ <entry> <title type="text">Post 09</title> - <id>/post/post09/index.html</id> + <id>http://example.org/post/post09/index.html</id> <updated>2016-09-09T00:00:00Z</updated> <published>2016-09-09T00:00:00Z</published> <link href="http://example.org/post/post09/index.html" /> @@ -297,7 +297,7 @@ <entry> <title type="text">Post 08</title> - <id>/post/post08/index.html</id> + <id>http://example.org/post/post08/index.html</id> <updated>2016-09-08T00:00:00Z</updated> <published>2016-09-08T00:00:00Z</published> <link href="http://example.org/post/post08/index.html" /> @@ -311,7 +311,7 @@ <entry> <title type="text">Post 07</title> - <id>/post/post07/index.html</id> + <id>http://example.org/post/post07/index.html</id> <updated>2016-09-07T00:00:00Z</updated> <published>2016-09-07T00:00:00Z</published> <link href="http://example.org/post/post07/index.html" /> @@ -325,7 +325,7 @@ <entry> <title type="text">Post 06</title> - <id>/post/post06/index.html</id> + <id>http://example.org/post/post06/index.html</id> <updated>2016-09-06T00:00:00Z</updated> <published>2016-09-06T00:00:00Z</published> <link href="http://example.org/post/post06/index.html" /> @@ -339,7 +339,7 @@ <entry> <title type="text">Post 05</title> - <id>/post/post05/index.html</id> + <id>http://example.org/post/post05/index.html</id> <updated>2016-09-05T00:00:00Z</updated> <published>2016-09-05T00:00:00Z</published> <link href="http://example.org/post/post05/index.html" /> @@ -353,7 +353,7 @@ <entry> <title type="text">Post 04</title> - <id>/post/post04/index.html</id> + <id>http://example.org/post/post04/index.html</id> <updated>2016-09-04T00:00:00Z</updated> <published>2016-09-04T00:00:00Z</published> <link href="http://example.org/post/post04/index.html" /> @@ -367,7 +367,7 @@ <entry> <title type="text">Post 03</title> - <id>/post/post03/index.html</id> + <id>http://example.org/post/post03/index.html</id> <updated>2016-09-03T00:00:00Z</updated> <published>2016-09-03T00:00:00Z</published> <link href="http://example.org/post/post03/index.html" /> @@ -381,7 +381,7 @@ <entry> <title type="text">Post 02</title> - <id>/post/post02/index.html</id> + <id>http://example.org/post/post02/index.html</id> <updated>2016-09-02T00:00:00Z</updated> <published>2016-09-02T00:00:00Z</published> <link href="http://example.org/post/post02/index.html" /> @@ -395,7 +395,7 @@ <entry> <title type="text">Post 01</title> - <id>/post/post01/index.html</id> + <id>http://example.org/post/post01/index.html</id> <updated>2016-09-01T00:00:00Z</updated> <published>2016-09-01T00:00:00Z</published> <link href="http://example.org/post/post01/index.html" /> @@ -469,7 +469,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - {{ FILTER_TAG }}{% endif %}</title> - <id>{{ BASE_URL }}/atom/{% ifdef FILTER_TAG %}{{ FILTER_TAG }}/{% endif %}</id> + <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/atom/{% ifdef FILTER_TAG %}{{ FILTER_TAG }}/{% endif %}</id> <updated>{{ DATE_FIRST_FORMATTED }}</updated> <link href="{{ BASE_DOMAIN }}{{ BASE_URL }}/" /> <link href="{{ BASE_DOMAIN }}{{ BASE_URL }}/atom/{% ifdef FILTER_TAG %}{{ FILTER_TAG }}/{% endif %}" rel="self" /> @@ -481,7 +481,7 @@ {% block listing %} <entry> <title type="text">{{ TITLE }}</title> - <id>{{ BASE_URL }}/post/{{ FILENAME }}/</id> + <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/</id> <updated>{{ DATE_FORMATTED }}</updated> <published>{{ DATE_FORMATTED }}</published> <link href="{{ BASE_DOMAIN }}{{ BASE_URL }}/post/{{ FILENAME }}/" /> @@ -516,7 +516,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/atom/</id> + <id>http://example.org/atom/</id> <updated>2016-09-11T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atom/" rel="self" /> @@ -528,7 +528,7 @@ <entry> <title type="text">Post 11</title> - <id>/post/post11/</id> + <id>http://example.org/post/post11/</id> <updated>2016-09-11T00:00:00Z</updated> <published>2016-09-11T00:00:00Z</published> <link href="http://example.org/post/post11/" /> @@ -542,7 +542,7 @@ <entry> <title type="text">Post 10</title> - <id>/post/post10/</id> + <id>http://example.org/post/post10/</id> <updated>2016-09-10T00:00:00Z</updated> <published>2016-09-10T00:00:00Z</published> <link href="http://example.org/post/post10/" /> @@ -556,7 +556,7 @@ <entry> <title type="text">Post 09</title> - <id>/post/post09/</id> + <id>http://example.org/post/post09/</id> <updated>2016-09-09T00:00:00Z</updated> <published>2016-09-09T00:00:00Z</published> <link href="http://example.org/post/post09/" /> @@ -570,7 +570,7 @@ <entry> <title type="text">Post 08</title> - <id>/post/post08/</id> + <id>http://example.org/post/post08/</id> <updated>2016-09-08T00:00:00Z</updated> <published>2016-09-08T00:00:00Z</published> <link href="http://example.org/post/post08/" /> @@ -584,7 +584,7 @@ <entry> <title type="text">Post 07</title> - <id>/post/post07/</id> + <id>http://example.org/post/post07/</id> <updated>2016-09-07T00:00:00Z</updated> <published>2016-09-07T00:00:00Z</published> <link href="http://example.org/post/post07/" /> @@ -598,7 +598,7 @@ <entry> <title type="text">Post 06</title> - <id>/post/post06/</id> + <id>http://example.org/post/post06/</id> <updated>2016-09-06T00:00:00Z</updated> <published>2016-09-06T00:00:00Z</published> <link href="http://example.org/post/post06/" /> @@ -612,7 +612,7 @@ <entry> <title type="text">Post 05</title> - <id>/post/post05/</id> + <id>http://example.org/post/post05/</id> <updated>2016-09-05T00:00:00Z</updated> <published>2016-09-05T00:00:00Z</published> <link href="http://example.org/post/post05/" /> @@ -626,7 +626,7 @@ <entry> <title type="text">Post 04</title> - <id>/post/post04/</id> + <id>http://example.org/post/post04/</id> <updated>2016-09-04T00:00:00Z</updated> <published>2016-09-04T00:00:00Z</published> <link href="http://example.org/post/post04/" /> @@ -640,7 +640,7 @@ <entry> <title type="text">Post 03</title> - <id>/post/post03/</id> + <id>http://example.org/post/post03/</id> <updated>2016-09-03T00:00:00Z</updated> <published>2016-09-03T00:00:00Z</published> <link href="http://example.org/post/post03/" /> @@ -654,7 +654,7 @@ <entry> <title type="text">Post 02</title> - <id>/post/post02/</id> + <id>http://example.org/post/post02/</id> <updated>2016-09-02T00:00:00Z</updated> <published>2016-09-02T00:00:00Z</published> <link href="http://example.org/post/post02/" /> @@ -668,7 +668,7 @@ <entry> <title type="text">Post 01</title> - <id>/post/post01/</id> + <id>http://example.org/post/post01/</id> <updated>2016-09-01T00:00:00Z</updated> <published>2016-09-01T00:00:00Z</published> <link href="http://example.org/post/post01/" /> @@ -806,7 +806,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/atom.xml</id> + <id>http://example.org/atom.xml</id> <updated>2016-10-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atom.xml" rel="self" /> @@ -818,7 +818,7 @@ <entry> <title type="text">Foo</title> - <id>/post/foo/index.html</id> + <id>http://example.org/post/foo/index.html</id> <updated>2016-10-01T00:00:00Z</updated> <published>2016-10-01T00:00:00Z</published> <link href="http://example.org/post/foo/index.html" /> @@ -832,7 +832,7 @@ <entry> <title type="text">Bar</title> - <id>/post/bar/index.html</id> + <id>http://example.org/post/bar/index.html</id> <updated>2016-09-01T00:00:00Z</updated> <published>2016-09-01T00:00:00Z</published> <link href="http://example.org/post/bar/index.html" /> @@ -922,7 +922,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/atom.xml</id> + <id>http://example.org/atom.xml</id> <updated>2016-10-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atom.xml" rel="self" /> @@ -934,7 +934,7 @@ <entry> <title type="text">Foo</title> - <id>/post/foo/index.html</id> + <id>http://example.org/post/foo/index.html</id> <updated>2016-10-01T00:00:00Z</updated> <published>2016-10-01T00:00:00Z</published> <link href="http://example.org/post/foo/index.html" /> @@ -948,7 +948,7 @@ <entry> <title type="text">Bar</title> - <id>/post/bar/index.html</id> + <id>http://example.org/post/bar/index.html</id> <updated>2016-09-01T00:00:00Z</updated> <published>2016-09-01T00:00:00Z</published> <link href="http://example.org/post/bar/index.html" /> @@ -962,7 +962,7 @@ <entry> <title type="text">Baz</title> - <id>/post/baz/index.html</id> + <id>http://example.org/post/baz/index.html</id> <updated>2016-08-01T00:00:00Z</updated> <published>2016-08-01T00:00:00Z</published> <link href="http://example.org/post/baz/index.html" /> @@ -982,7 +982,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website - tag1</title> - <id>/atom/tag1.xml</id> + <id>http://example.org/atom/tag1.xml</id> <updated>2016-08-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atom/tag1.xml" rel="self" /> @@ -994,7 +994,7 @@ <entry> <title type="text">Baz</title> - <id>/post/baz/index.html</id> + <id>http://example.org/post/baz/index.html</id> <updated>2016-08-01T00:00:00Z</updated> <published>2016-08-01T00:00:00Z</published> <link href="http://example.org/post/baz/index.html" /> @@ -1014,7 +1014,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website - tag2</title> - <id>/atom/tag2.xml</id> + <id>http://example.org/atom/tag2.xml</id> <updated>2016-08-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atom/tag2.xml" rel="self" /> @@ -1026,7 +1026,7 @@ <entry> <title type="text">Baz</title> - <id>/post/baz/index.html</id> + <id>http://example.org/post/baz/index.html</id> <updated>2016-08-01T00:00:00Z</updated> <published>2016-08-01T00:00:00Z</published> <link href="http://example.org/post/baz/index.html" /> @@ -1243,7 +1243,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/atoom/index.xml</id> + <id>http://example.org/atoom/index.xml</id> <updated>2016-10-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atoom/index.xml" rel="self" /> @@ -1255,7 +1255,7 @@ <entry> <title type="text">Foo</title> - <id>/poost/foo.html</id> + <id>http://example.org/poost/foo.html</id> <updated>2016-10-01T00:00:00Z</updated> <published>2016-10-01T00:00:00Z</published> <link href="http://example.org/poost/foo.html" /> @@ -1347,7 +1347,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website - tag1</title> - <id>/atoom/tag1/index.xml</id> + <id>http://example.org/atoom/tag1/index.xml</id> <updated>2016-08-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atoom/tag1/index.xml" rel="self" /> @@ -1359,7 +1359,7 @@ <entry> <title type="text">Baz</title> - <id>/poost/baz.html</id> + <id>http://example.org/poost/baz.html</id> <updated>2016-08-01T00:00:00Z</updated> <published>2016-08-01T00:00:00Z</published> <link href="http://example.org/poost/baz.html" /> @@ -1379,7 +1379,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website - tag2</title> - <id>/atoom/tag2/index.xml</id> + <id>http://example.org/atoom/tag2/index.xml</id> <updated>2016-08-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/atoom/tag2/index.xml" rel="self" /> @@ -1391,7 +1391,7 @@ <entry> <title type="text">Baz</title> - <id>/poost/baz.html</id> + <id>http://example.org/poost/baz.html</id> <updated>2016-08-01T00:00:00Z</updated> <published>2016-08-01T00:00:00Z</published> <link href="http://example.org/poost/baz.html" /> @@ -1659,7 +1659,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">{{ SITE_TITLE }}{% ifdef FILTER_TAG %} - {{ FILTER_TAG }}{% endif %}</title> - <id>{{ BASE_URL }}/atoom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}{% endif %}/index.xml</id> + <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/atoom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}{% endif %}/index.xml</id> <updated>{{ DATE_FIRST_FORMATTED }}</updated> <link href="{{ BASE_DOMAIN }}{{ BASE_URL }}/" /> <link href="{{ BASE_DOMAIN }}{{ BASE_URL }}/atoom{% ifdef FILTER_TAG %}/{{ FILTER_TAG }}{% endif %}/index.xml" rel="self" /> @@ -1671,7 +1671,7 @@ {% block listing %} <entry> <title type="text">{{ TITLE }}</title> - <id>{{ BASE_URL }}/poost/{{ FILENAME }}.html</id> + <id>{{ BASE_DOMAIN }}{{ BASE_URL }}/poost/{{ FILENAME }}.html</id> <updated>{{ DATE_FORMATTED }}</updated> <published>{{ DATE_FORMATTED }}</published> <link href="{{ BASE_DOMAIN }}{{ BASE_URL }}/poost/{{ FILENAME }}.html" /> @@ -1784,7 +1784,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/index.xml</id> + <id>http://example.org/index.xml</id> <updated>2016-10-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/index.xml" rel="self" /> @@ -1796,7 +1796,7 @@ <entry> <title type="text">Foo</title> - <id>/foo/index.html</id> + <id>http://example.org/foo/index.html</id> <updated>2016-10-01T00:00:00Z</updated> <published>2016-10-01T00:00:00Z</published> <link href="http://example.org/foo/index.html" /> @@ -1916,7 +1916,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website</title> - <id>/index.xml</id> + <id>http://example.org/index.xml</id> <updated>2016-10-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/index.xml" rel="self" /> @@ -1928,7 +1928,7 @@ <entry> <title type="text">Foo</title> - <id>/foo.html</id> + <id>http://example.org/foo.html</id> <updated>2016-10-01T00:00:00Z</updated> <published>2016-10-01T00:00:00Z</published> <link href="http://example.org/foo.html" /> @@ -1948,7 +1948,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website - tag1</title> - <id>/tag1/index.xml</id> + <id>http://example.org/tag1/index.xml</id> <updated>2016-08-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/tag1/index.xml" rel="self" /> @@ -1960,7 +1960,7 @@ <entry> <title type="text">Baz</title> - <id>/baz.html</id> + <id>http://example.org/baz.html</id> <updated>2016-08-01T00:00:00Z</updated> <published>2016-08-01T00:00:00Z</published> <link href="http://example.org/baz.html" /> @@ -1980,7 +1980,7 @@ <?xml version="1.0" encoding="utf-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title type="text">Lol's Website - tag2</title> - <id>/tag2/index.xml</id> + <id>http://example.org/tag2/index.xml</id> <updated>2016-08-01T00:00:00Z</updated> <link href="http://example.org/" /> <link href="http://example.org/tag2/index.xml" rel="self" /> @@ -1992,7 +1992,7 @@ <entry> <title type="text">Baz</title> - <id>/baz.html</id> + <id>http://example.org/baz.html</id> <updated>2016-08-01T00:00:00Z</updated> <published>2016-08-01T00:00:00Z</published> <link href="http://example.org/baz.html" />